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

11.1 Files compared

# Location File Last Modified
1 D:\P\boost_1_47_0\boost\fusion\container\list cons_iterator.hpp Thu Nov 10 22:00:52 2011 UTC
2 D:\P\boost_1_47_0_native\boost\fusion\container\list cons_iterator.hpp Sat Jul 3 21:10:58 2010 UTC

11.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 12 156
Changed 11 22
Inserted 0 0
Removed 0 0

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

11.4 Active regular expressions

No regular expressions were active.

11.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_ CONS_ITERA TOR_071720 05_0849)   8   #if !defin ed(FUSION_ CONS_ITERA TOR_071720 05_0849)
9   #define FU SION_CONS_ ITERATOR_0 7172005_08 49   9   #define FU SION_CONS_ ITERATOR_0 7172005_08 49
10     10  
11   #include < boost/type _traits/ad d_const.hp p>   11   #include < boost/type _traits/ad d_const.hp p>
12   #include < boost/fusi on/support /iterator_ base.hpp>   12   #include < boost/fusi on/support /iterator_ base.hpp>
13   #include < boost/fusi on/contain er/list/de tail/deref _impl.hpp>   13   #include < boost/fusi on/contain er/list/de tail/deref _impl.hpp>
14   #include < boost/fusi on/contain er/list/de tail/next_ impl.hpp>   14   #include < boost/fusi on/contain er/list/de tail/next_ impl.hpp>
15   #include < boost/fusi on/contain er/list/de tail/value _of_impl.h pp>   15   #include < boost/fusi on/contain er/list/de tail/value _of_impl.h pp>
16   #include < boost/fusi on/contain er/list/de tail/equal _to_impl.h pp>   16   #include < boost/fusi on/contain er/list/de tail/equal _to_impl.h pp>
17   #include < boost/fusi on/contain er/list/li st_fwd.hpp >   17   #include < boost/fusi on/contain er/list/li st_fwd.hpp >
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  cons_iter ator_tag;   22       struct  cons_iter ator_tag;
23       struct  forward_t raversal_t ag;   23       struct  forward_t raversal_t ag;
24     24  
25       templa te <typena me Cons>   25       templa te <typena me Cons>
26       struct  cons_iter ator_ident ity;   26       struct  cons_iter ator_ident ity;
27     27  
28        template   <typename   Cons   =   nil _t >   28        template   <typename   Cons   =   nil
>
29       struct  cons_iter ator : ite rator_base <cons_iter ator<Cons>  >   29       struct  cons_iter ator : ite rator_base <cons_iter ator<Cons>  >
30       {   30       {
31           ty pedef cons _iterator_ tag fusion _tag;   31           ty pedef cons _iterator_ tag fusion _tag;
32           ty pedef forw ard_traver sal_tag ca tegory;   32           ty pedef forw ard_traver sal_tag ca tegory;
33           ty pedef Cons  cons_type ;   33           ty pedef Cons  cons_type ;
34           ty pedef cons _iterator_ identity<   34           ty pedef cons _iterator_ identity<
35                typename  add_const <Cons>::ty pe>    35                typename  add_const <Cons>::ty pe> 
36           id entity;   36           id entity;
37     37  
38           ex plicit con s_iterator (cons_type & in_cons)   38           ex plicit con s_iterator (cons_type & in_cons)
39                : cons(i n_cons) {}   39                : cons(i n_cons) {}
40     40  
41           co ns_type& c ons;   41           co ns_type& c ons;
42     42  
43       privat e:   43       privat e:
44           //  silence M SVC warnin g C4512: a ssignment  operator c ould not b e generate d   44           //  silence M SVC warnin g C4512: a ssignment  operator c ould not b e generate d
45           co ns_iterato r& operato r= (cons_i terator co nst&);   45           co ns_iterato r& operato r= (cons_i terator co nst&);
46       };   46       };
47     47  
48       struct  nil_itera tor : iter ator_base< nil_iterat or>   48       struct  nil_itera tor : iter ator_base< nil_iterat or>
49       {   49       {
50           ty pedef forw ard_traver sal_tag ca tegory;   50           ty pedef forw ard_traver sal_tag ca tegory;
51           ty pedef cons _iterator_ tag fusion _tag;   51           ty pedef cons _iterator_ tag fusion _tag;
52            typedef   nil _t   cons_type;   52            typedef   nil  
cons_type;
53           ty pedef cons _iterator_ identity<   53           ty pedef cons _iterator_ identity<
54                 add_const< nil _t >::type>     54                 add_const< nil
>::type>  
55           id entity;   55           id entity;
56           ni l_iterator () {}   56           ni l_iterator () {}
57            explicit   nil_iterat or(nil _t   const&)   {}   57            explicit   nil_iterat or(nil  
const&)   {}
58       };   58       };
59     59  
60       templa te <>   60       templa te <>
61        struct   cons_itera tor<nil _t >   :   nil_iterat or     61        struct   cons_itera tor<nil
>   :   nil_iterat or  
62       {   62       {
63           co ns_iterato r() {}   63           co ns_iterato r() {}
64            explicit   cons_itera tor(nil _t   const&)   {}   64            explicit   cons_itera tor(nil  
const&)   {}
65       };   65       };
66     66  
67       templa te <>   67       templa te <>
68        struct   cons_itera tor<nil _t   const>   :   nil_iterat or     68        struct   cons_itera tor<nil  
const>   :   nil_iterat or  
69       {   69       {
70           co ns_iterato r() {}   70           co ns_iterato r() {}
71            explicit   cons_itera tor(nil _t   const&)   {}   71            explicit   cons_itera tor(nil  
const&)   {}
72       };   72       };
73     73  
74       templa te <>   74       templa te <>
75       struct  cons_iter ator<list< > > : nil_ iterator    75       struct  cons_iter ator<list< > > : nil_ iterator 
76       {   76       {
77           co ns_iterato r() {}   77           co ns_iterato r() {}
78            explicit   cons_itera tor(nil _t   const&)   {}   78            explicit   cons_itera tor(nil  
const&)   {}
79       };   79       };
80     80  
81       templa te <>   81       templa te <>
82       struct  cons_iter ator<list< > const> :  nil_itera tor    82       struct  cons_iter ator<list< > const> :  nil_itera tor 
83       {   83       {
84           co ns_iterato r() {}   84           co ns_iterato r() {}
85            explicit   cons_itera tor(nil _t   const&)   {}   85            explicit   cons_itera tor(nil  
const&)   {}
86       };   86       };
87   }}   87   }}
88     88  
89   #endif   89   #endif