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

12.1 Files compared

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

12.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 2 134
Changed 1 2
Inserted 0 0
Removed 0 0

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

12.4 Active regular expressions

No regular expressions were active.

12.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_07172 005_1153)   7   #if !defin ed(FUSION_ LIST_07172 005_1153)
8   #define FU SION_LIST_ 07172005_1 153   8   #define FU SION_LIST_ 07172005_1 153
9     9  
10   #include < boost/fusi on/contain er/list/li st_fwd.hpp >   10   #include < boost/fusi on/contain er/list/li st_fwd.hpp >
11   #include < boost/fusi on/contain er/list/de tail/list_ to_cons.hp p>   11   #include < boost/fusi on/contain er/list/de tail/list_ to_cons.hp p>
12     12  
13   namespace  boost { na mespace fu sion   13   namespace  boost { na mespace fu sion
14   {   14   {
15        struct   nil _t ;   15        struct   nil
;
16       struct  void_;   16       struct  void_;
17     17  
18       templa te <BOOST_ PP_ENUM_PA RAMS(FUSIO N_MAX_LIST _SIZE, typ ename T)>   18       templa te <BOOST_ PP_ENUM_PA RAMS(FUSIO N_MAX_LIST _SIZE, typ ename T)>
19       struct  list    19       struct  list 
20           :  detail::li st_to_cons <BOOST_PP_ ENUM_PARAM S(FUSION_M AX_LIST_SI ZE, T)>::t ype   20           :  detail::li st_to_cons <BOOST_PP_ ENUM_PARAM S(FUSION_M AX_LIST_SI ZE, T)>::t ype
21       {   21       {
22       privat e:   22       privat e:
23           ty pedef    23           ty pedef 
24                detail:: list_to_co ns<BOOST_P P_ENUM_PAR AMS(FUSION _MAX_LIST_ SIZE, T)>   24                detail:: list_to_co ns<BOOST_P P_ENUM_PAR AMS(FUSION _MAX_LIST_ SIZE, T)>
25           li st_to_cons ;   25           li st_to_cons ;
26     26  
27       public :   27       public :
28           ty pedef type name list_ to_cons::t ype inheri ted_type;   28           ty pedef type name list_ to_cons::t ype inheri ted_type;
29     29  
30           li st()   30           li st()
31                : inheri ted_type()  {}   31                : inheri ted_type()  {}
32     32  
33           te mplate <BO OST_PP_ENU M_PARAMS(F USION_MAX_ LIST_SIZE,  typename  U)>   33           te mplate <BO OST_PP_ENU M_PARAMS(F USION_MAX_ LIST_SIZE,  typename  U)>
34           li st(list<BO OST_PP_ENU M_PARAMS(F USION_MAX_ LIST_SIZE,  U)> const & rhs)   34           li st(list<BO OST_PP_ENU M_PARAMS(F USION_MAX_ LIST_SIZE,  U)> const & rhs)
35                : inheri ted_type(r hs) {}   35                : inheri ted_type(r hs) {}
36     36  
37           te mplate <ty pename Seq uence>   37           te mplate <ty pename Seq uence>
38           li st(Sequenc e const& r hs)   38           li st(Sequenc e const& r hs)
39                : inheri ted_type(r hs) {}   39                : inheri ted_type(r hs) {}
40     40  
41           //   Expand a  couple of  forwardin g construc tors for a rguments   41           //   Expand a  couple of  forwardin g construc tors for a rguments
42           //   of type  (T0), (T0,  T1), (T0,  T1, T2) e tc. Exanpl e:   42           //   of type  (T0), (T0,  T1), (T0,  T1, T2) e tc. Exanpl e:
43           //   43           //
44           //   list(   44           //   list(
45           //       type name detai l::call_pa ram<T0>::t ype _0   45           //       type name detai l::call_pa ram<T0>::t ype _0
46           //     , type name detai l::call_pa ram<T1>::t ype _1)   46           //     , type name detai l::call_pa ram<T1>::t ype _1)
47           //     : inhe rited_type (list_to_c ons::call( _0, _1)) { }   47           //     : inhe rited_type (list_to_c ons::call( _0, _1)) { }
48           #i nclude <bo ost/fusion /container /list/deta il/list_fo rward_ctor .hpp>   48           #i nclude <bo ost/fusion /container /list/deta il/list_fo rward_ctor .hpp>
49     49  
50           te mplate <BO OST_PP_ENU M_PARAMS(F USION_MAX_ LIST_SIZE,  typename  U)>   50           te mplate <BO OST_PP_ENU M_PARAMS(F USION_MAX_ LIST_SIZE,  typename  U)>
51           li st&   51           li st&
52           op erator=(li st<BOOST_P P_ENUM_PAR AMS(FUSION _MAX_LIST_ SIZE, U)>  const& rhs )   52           op erator=(li st<BOOST_P P_ENUM_PAR AMS(FUSION _MAX_LIST_ SIZE, U)>  const& rhs )
53           {   53           {
54                inherite d_type::op erator=(rh s);   54                inherite d_type::op erator=(rh s);
55                return * this;   55                return * this;
56           }   56           }
57     57  
58           te mplate <ty pename T>   58           te mplate <ty pename T>
59           li st&   59           li st&
60           op erator=(T  const& rhs )   60           op erator=(T  const& rhs )
61           {   61           {
62                inherite d_type::op erator=(rh s);   62                inherite d_type::op erator=(rh s);
63                return * this;   63                return * this;
64           }   64           }
65       };   65       };
66   }}   66   }}
67     67  
68   #endif   68   #endif