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

6.1 Files compared

# Location File Last Modified
1 D:\P\boost_1_47_0\boost\fusion\container\list\detail build_cons.hpp Thu Nov 10 22:06:30 2011 UTC
2 D:\P\boost_1_47_0_native\boost\fusion\container\list\detail build_cons.hpp Thu Jul 7 05:57:38 2011 UTC

6.2 Comparison summary

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

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

6.4 Active regular expressions

No regular expressions were active.

6.5 Comparison detail

1   /*======== ========== ========== ========== ========== ========== ========== =========   1   /*======== ========== ========== ========== ========== ========== ========== =========
2       Copyri ght (c) 20 01-2006 Jo el de Guzm an   2       Copyri ght (c) 20 01-2006 Jo el de Guzm an
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_ BUILD_CONS _09232005_ 1222)   7   #if !defin ed(FUSION_ BUILD_CONS _09232005_ 1222)
8   #define FU SION_BUILD _CONS_0923 2005_1222   8   #define FU SION_BUILD _CONS_0923 2005_1222
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   #include < boost/fusi on/iterato r/equal_to .hpp>   11   #include < boost/fusi on/iterato r/equal_to .hpp>
12   #include < boost/fusi on/iterato r/next.hpp >   12   #include < boost/fusi on/iterato r/next.hpp >
13   #include < boost/fusi on/iterato r/value_of .hpp>   13   #include < boost/fusi on/iterato r/value_of .hpp>
14   #include < boost/fusi on/iterato r/deref.hp p>   14   #include < boost/fusi on/iterato r/deref.hp p>
15     15  
16   namespace  boost { na mespace fu sion { nam espace det ail   16   namespace  boost { na mespace fu sion { nam espace det ail
17   {   17   {
18       templa te <   18       templa te <
19           ty pename Fir st   19           ty pename Fir st
20         , ty pename Las t   20         , ty pename Las t
21         , bo ol is_empt y = result _of::equal _to<First,  Last>::va lue>   21         , bo ol is_empt y = result _of::equal _to<First,  Last>::va lue>
22       struct  build_con s;   22       struct  build_con s;
23     23  
24       templa te <typena me First,  typename L ast>   24       templa te <typena me First,  typename L ast>
25       struct  build_con s<First, L ast, true>   25       struct  build_con s<First, L ast, true>
26       {   26       {
27            typedef   nil _t   type;   27            typedef   nil  
type;
28              28           
29            static   nil _t   29            static   nil
30           ca ll(First c onst&, Las t const&)   30           ca ll(First c onst&, Las t const&)
31           {   31           {
32                 return   nil _t ();   32                 return   nil
();
33           }   33           }
34       };   34       };
35     35  
36       templa te <typena me First,  typename L ast>   36       templa te <typena me First,  typename L ast>
37       struct  build_con s<First, L ast, false >   37       struct  build_con s<First, L ast, false >
38       {   38       {
39           ty pedef     39           ty pedef  
40                build_co ns<typenam e result_o f::next<Fi rst>::type , Last>   40                build_co ns<typenam e result_o f::next<Fi rst>::type , Last>
41           ne xt_build_c ons;   41           ne xt_build_c ons;
42     42  
43           ty pedef cons <   43           ty pedef cons <
44                typename  result_of ::value_of <First>::t ype   44                typename  result_of ::value_of <First>::t ype
45              , typename  next_buil d_cons::ty pe>    45              , typename  next_buil d_cons::ty pe> 
46           ty pe;   46           ty pe;
47     47  
48           st atic type   48           st atic type
49           ca ll(First c onst& f, L ast const&  l)   49           ca ll(First c onst& f, L ast const&  l)
50           {   50           {
51                typename  result_of ::deref<Fi rst>::type  v = *f;   51                typename  result_of ::deref<Fi rst>::type  v = *f;
52                return t ype(v, nex t_build_co ns::call(f usion::nex t(f), l));   52                return t ype(v, nex t_build_co ns::call(f usion::nex t(f), l));
53           }   53           }
54       };   54       };
55     55  
56   }}}   56   }}}
57     57  
58   #endif   58   #endif