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

8.1 Files compared

# Location File Last Modified
1 D:\P\boost_1_47_0\boost\fusion\container\list\detail end_impl.hpp Thu Nov 10 22:02:32 2011 UTC
2 D:\P\boost_1_47_0_native\boost\fusion\container\list\detail end_impl.hpp Tue Jul 8 03:39:56 2008 UTC

8.2 Comparison summary

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

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

8.4 Active regular expressions

No regular expressions were active.

8.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_ END_IMPL_0 7172005_08 28)   8   #if !defin ed(FUSION_ END_IMPL_0 7172005_08 28)
9   #define FU SION_END_I MPL_071720 05_0828   9   #define FU SION_END_I MPL_071720 05_0828
10     10  
11   #include < boost/mpl/ if.hpp>   11   #include < boost/mpl/ if.hpp>
12   #include < boost/type _traits/is _const.hpp >   12   #include < boost/type _traits/is _const.hpp >
13     13  
14   namespace  boost { na mespace fu sion   14   namespace  boost { na mespace fu sion
15   {   15   {
16        struct   nil _t ;   16        struct   nil
;
17     17  
18       struct  cons_tag;   18       struct  cons_tag;
19     19  
20       templa te <typena me Car, ty pename Cdr >   20       templa te <typena me Car, ty pename Cdr >
21       struct  cons;   21       struct  cons;
22     22  
23       templa te <typena me Cons>   23       templa te <typena me Cons>
24       struct  cons_iter ator;   24       struct  cons_iter ator;
25     25  
26       namesp ace extens ion   26       namesp ace extens ion
27       {   27       {
28           te mplate <ty pename Tag >   28           te mplate <ty pename Tag >
29           st ruct end_i mpl;   29           st ruct end_i mpl;
30     30  
31           te mplate <>   31           te mplate <>
32           st ruct end_i mpl<cons_t ag>   32           st ruct end_i mpl<cons_t ag>
33           {   33           {
34                template  <typename  Sequence>   34                template  <typename  Sequence>
35                struct a pply    35                struct a pply 
36                {   36                {
37                    type def cons_i terator<   37                    type def cons_i terator<
38                         typename   mpl::if_<i s_const<Se quence>,   nil _t   const,   nil _t >::type>   38                         typename   mpl::if_<i s_const<Se quence>,   nil  
const,   nil
>::type>
39                    type ;   39                    type ;
40          40       
41                    stat ic type   41                    stat ic type
42                    call (Sequence& )   42                    call (Sequence& )
43                    {   43                    {
44                         return typ e();   44                         return typ e();
45                    }   45                    }
46                };   46                };
47           };   47           };
48       }   48       }
49   }}   49   }}
50     50  
51   #endif   51   #endif