4. Araxis Merge File Comparison Report

Produced by Araxis Merge on Thu Nov 17 16:01:41 2011 UTC. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

4.1 Files compared

# Location File Last Modified
1 D:\P\boost_1_47_0\boost\fusion\container\generation make_cons.hpp Thu Nov 10 22:07:26 2011 UTC
2 D:\P\boost_1_47_0_native\boost\fusion\container\generation make_cons.hpp Sun Nov 25 19:07:20 2007 UTC

4.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 3 82
Changed 2 4
Inserted 0 0
Removed 0 0

4.3 Comparison options

Whitespace All differences in whitespace within lines are ignored
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

4.4 Active regular expressions

No regular expressions were active.

4.5 Comparison detail

1   /*======== ========== ========== ========== ========== ========== ========== =========   1   /*======== ========== ========== ========== ========== ========== ========== =========
2       Copyri ght (c) 20 05 Joel de  Guzman   2       Copyri ght (c) 20 05 Joel de  Guzman
3       Copyri ght (c) 20 05 Eric Ni ebler   3       Copyri ght (c) 20 05 Eric Ni ebler
4     4  
5       Distri buted unde r the Boos t Software  License,  Version 1. 0. (See ac companying     5       Distri buted unde r the Boos t Software  License,  Version 1. 0. (See ac companying  
6       file L ICENSE_1_0 .txt or co py at http ://www.boo st.org/LIC ENSE_1_0.t xt)   6       file L ICENSE_1_0 .txt or co py at http ://www.boo st.org/LIC ENSE_1_0.t xt)
7   ========== ========== ========== ========== ========== ========== ========== ========*/   7   ========== ========== ========== ========== ========== ========== ========== ========*/
8   #if !defin ed(FUSION_ MAKE_CONS_ 07172005_0 918)   8   #if !defin ed(FUSION_ MAKE_CONS_ 07172005_0 918)
9   #define FU SION_MAKE_ CONS_07172 005_0918   9   #define FU SION_MAKE_ CONS_07172 005_0918
10     10  
11   #include < boost/fusi on/support /detail/as _fusion_el ement.hpp>   11   #include < boost/fusi on/support /detail/as _fusion_el ement.hpp>
12   #include < boost/fusi on/contain er/list/co ns.hpp>   12   #include < boost/fusi on/contain er/list/co ns.hpp>
13     13  
14   namespace  boost { na mespace fu sion   14   namespace  boost { na mespace fu sion
15   {   15   {
16        struct   nil _t ;   16        struct   nil
;
17     17  
18       namesp ace result _of   18       namesp ace result _of
19       {   19       {
20            template   <typename   Car,   typename   Cdr   =   nil _t >   20            template   <typename   Car,   typename   Cdr   =   nil
>
21           st ruct make_ cons   21           st ruct make_ cons
22           {   22           {
23                typedef  cons<typen ame detail ::as_fusio n_element< Car>::type , Cdr> typ e;   23                typedef  cons<typen ame detail ::as_fusio n_element< Car>::type , Cdr> typ e;
24           };   24           };
25       }   25       }
26     26  
27       templa te <typena me Car>   27       templa te <typena me Car>
28       inline  cons<type name detai l::as_fusi on_element <Car>::typ e>   28       inline  cons<type name detai l::as_fusi on_element <Car>::typ e>
29       make_c ons(Car co nst& car)   29       make_c ons(Car co nst& car)
30       {   30       {
31           re turn cons< typename d etail::as_ fusion_ele ment<Car>: :type>(car );   31           re turn cons< typename d etail::as_ fusion_ele ment<Car>: :type>(car );
32       }   32       }
33     33  
34       templa te <typena me Car, ty pename Cdr >   34       templa te <typena me Car, ty pename Cdr >
35       inline  cons<type name detai l::as_fusi on_element <Car>::typ e, Cdr>   35       inline  cons<type name detai l::as_fusi on_element <Car>::typ e, Cdr>
36       make_c ons(Car co nst& car,  Cdr const&  cdr)   36       make_c ons(Car co nst& car,  Cdr const&  cdr)
37       {   37       {
38           re turn cons< typename d etail::as_ fusion_ele ment<Car>: :type, Cdr >(car, cdr );   38           re turn cons< typename d etail::as_ fusion_ele ment<Car>: :type, Cdr >(car, cdr );
39       }   39       }
40   }}   40   }}
41     41  
42   #endif   42   #endif
43     43