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

9.1 Files compared

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

9.2 Comparison summary

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

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

9.4 Active regular expressions

No regular expressions were active.

9.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_ LIST_TO_CO NS_0717200 5_1041)   7   #if !defin ed(FUSION_ LIST_TO_CO NS_0717200 5_1041)
8   #define FU SION_LIST_ TO_CONS_07 172005_104 1   8   #define FU SION_LIST_ TO_CONS_07 172005_104 1
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/contain er/list/li mits.hpp>   11   #include < boost/fusi on/contain er/list/li mits.hpp>
12   #include < boost/prep rocessor/r epetition/ enum.hpp>   12   #include < boost/prep rocessor/r epetition/ enum.hpp>
13   #include < boost/prep rocessor/r epetition/ enum_param s.hpp>   13   #include < boost/prep rocessor/r epetition/ enum_param s.hpp>
14   #include < boost/prep rocessor/r epetition/ enum_shift ed_params. hpp>   14   #include < boost/prep rocessor/r epetition/ enum_shift ed_params. hpp>
15   #include < boost/prep rocessor/a rithmetic/ dec.hpp>   15   #include < boost/prep rocessor/a rithmetic/ dec.hpp>
16     16  
17   #define FU SION_VOID( z, n, _) v oid_   17   #define FU SION_VOID( z, n, _) v oid_
18     18  
19   namespace  boost { na mespace fu sion   19   namespace  boost { na mespace fu sion
20   {   20   {
21        struct   nil _t ;   21        struct   nil
;
22       struct  void_;   22       struct  void_;
23   }}   23   }}
24     24  
25   namespace  boost { na mespace fu sion { nam espace det ail   25   namespace  boost { na mespace fu sion { nam espace det ail
26   {   26   {
27       templa te <BOOST_ PP_ENUM_PA RAMS(FUSIO N_MAX_LIST _SIZE, typ ename T)>   27       templa te <BOOST_ PP_ENUM_PA RAMS(FUSIO N_MAX_LIST _SIZE, typ ename T)>
28       struct  list_to_c ons   28       struct  list_to_c ons
29       {   29       {
30           ty pedef T0 h ead_type;   30           ty pedef T0 h ead_type;
31           ty pedef list _to_cons<   31           ty pedef list _to_cons<
32                BOOST_PP _ENUM_SHIF TED_PARAMS (FUSION_MA X_LIST_SIZ E, T), voi d_>   32                BOOST_PP _ENUM_SHIF TED_PARAMS (FUSION_MA X_LIST_SIZ E, T), voi d_>
33           ta il_list_to _cons;   33           ta il_list_to _cons;
34           ty pedef type name tail_ list_to_co ns::type t ail_type;   34           ty pedef type name tail_ list_to_co ns::type t ail_type;
35              35           
36           ty pedef cons <head_type , tail_typ e> type;   36           ty pedef cons <head_type , tail_typ e> type;
37              37           
38           #i nclude <bo ost/fusion /container /list/deta il/list_to _cons_call .hpp>   38           #i nclude <bo ost/fusion /container /list/deta il/list_to _cons_call .hpp>
39       };   39       };
40     40  
41       templa te <>   41       templa te <>
42       struct  list_to_c ons<BOOST_ PP_ENUM(FU SION_MAX_L IST_SIZE,  FUSION_VOI D, _)>   42       struct  list_to_c ons<BOOST_ PP_ENUM(FU SION_MAX_L IST_SIZE,  FUSION_VOI D, _)>
43       {   43       {
44            typedef   nil _t   type;   44            typedef   nil  
type;
45       };       45       };    
46   }}}   46   }}}
47     47  
48   #undef FUS ION_VOID   48   #undef FUS ION_VOID
49   #endif   49   #endif