3. 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.

3.1 Files compared

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

3.2 Comparison summary

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

3.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

3.4 Active regular expressions

No regular expressions were active.

3.5 Comparison detail

1   /*======== ========== ========== ========== ========== ========== ========== =========   1   /*======== ========== ========== ========== ========== ========== ========== =========
2       Copyri ght (c) 20 05 Joel de  Guzman   2       Copyri ght (c) 20 05 Joel de  Guzman
3     3  
4       Distri buted unde r the Boos t Software  License,  Version 1. 0. (See ac companying     4       Distri buted unde r the Boos t Software  License,  Version 1. 0. (See ac companying  
5       file L ICENSE_1_0 .txt or co py at http ://www.boo st.org/LIC ENSE_1_0.t xt)   5       file L ICENSE_1_0 .txt or co py at http ://www.boo st.org/LIC ENSE_1_0.t xt)
6   ========== ========== ========== ========== ========== ========== ========== ========*/   6   ========== ========== ========== ========== ========== ========== ========== ========*/
7   #if !defin ed(FUSION_ CONS_TIE_0 7182005_08 54)   7   #if !defin ed(FUSION_ CONS_TIE_0 7182005_08 54)
8   #define FU SION_CONS_ TIE_071820 05_0854   8   #define FU SION_CONS_ TIE_071820 05_0854
9     9  
10   #include < boost/fusi on/contain er/list/co ns.hpp>   10   #include < boost/fusi on/contain er/list/co ns.hpp>
11     11  
12   namespace  boost { na mespace fu sion   12   namespace  boost { na mespace fu sion
13   {   13   {
14        struct   nil _t ;   14        struct   nil
;
15     15  
16       namesp ace result _of   16       namesp ace result _of
17       {   17       {
18            template   <typename   Car,   typename   Cdr   =   nil _t >   18            template   <typename   Car,   typename   Cdr   =   nil
>
19           st ruct cons_ tie   19           st ruct cons_ tie
20           {   20           {
21                typedef  cons<Car&,  Cdr> type ;   21                typedef  cons<Car&,  Cdr> type ;
22           };   22           };
23       }   23       }
24     24  
25       // $$$  do we rea lly want a  cons_tie?  $$$   25       // $$$  do we rea lly want a  cons_tie?  $$$
26       templa te <typena me Car>   26       templa te <typena me Car>
27       inline  cons<Car& >   27       inline  cons<Car& >
28       cons_t ie(Car& ca r)   28       cons_t ie(Car& ca r)
29       {   29       {
30           re turn cons< Car&>(car) ;   30           re turn cons< Car&>(car) ;
31       }   31       }
32     32  
33       // $$$  do we rea lly want a  cons_tie?  $$$   33       // $$$  do we rea lly want a  cons_tie?  $$$
34       templa te <typena me Car, ty pename Cdr >   34       templa te <typena me Car, ty pename Cdr >
35       inline  cons<Car& , Cdr>   35       inline  cons<Car& , Cdr>
36       cons_t ie(Car& ca r, Cdr con st& cdr)   36       cons_t ie(Car& ca r, Cdr con st& cdr)
37       {   37       {
38           re turn cons< Car&, Cdr> (car, cdr) ;   38           re turn cons< Car&, Cdr> (car, cdr) ;
39       }   39       }
40   }}   40   }}
41     41  
42   #endif   42   #endif
43     43