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

7.1 Files compared

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

7.2 Comparison summary

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

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

7.4 Active regular expressions

No regular expressions were active.

7.5 Comparison detail

1   /*======== ========== ========== ========== ========== ========== ========== =========   1   /*======== ========== ========== ========== ========== ========== ========== =========
2       Copyri ght (c) 20 07 Tobias  Schwinger   2       Copyri ght (c) 20 07 Tobias  Schwinger
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(BOOST_F USION_SEQU ENCE_EMPTY _IMPL_HPP_ INCLUDED)   7   #if !defin ed(BOOST_F USION_SEQU ENCE_EMPTY _IMPL_HPP_ INCLUDED)
8   #define BO OST_FUSION _SEQUENCE_ EMPTY_IMPL _HPP_INCLU DED   8   #define BO OST_FUSION _SEQUENCE_ EMPTY_IMPL _HPP_INCLU DED
9     9  
10   #include < boost/type _traits/is _convertib le.hpp>   10   #include < boost/type _traits/is _convertib le.hpp>
11     11  
12   namespace  boost { na mespace fu sion   12   namespace  boost { na mespace fu sion
13   {   13   {
14       struct  cons_tag;   14       struct  cons_tag;
15     15  
16        struct   nil _t ;   16        struct   nil
;
17     17  
18       templa te <typena me Car, ty pename Cdr >   18       templa te <typena me Car, ty pename Cdr >
19       struct  cons;   19       struct  cons;
20     20  
21       namesp ace extens ion   21       namesp ace extens ion
22       {   22       {
23           te mplate <ty pename Tag >   23           te mplate <ty pename Tag >
24           st ruct empty _impl;   24           st ruct empty _impl;
25     25  
26           te mplate <>   26           te mplate <>
27           st ruct empty _impl<cons _tag>   27           st ruct empty _impl<cons _tag>
28           {   28           {
29                template  <typename  Sequence>   29                template  <typename  Sequence>
30                struct a pply   30                struct a pply
31                     :   boost::is_ convertibl e<Sequence ,   nil _t >   31                     :   boost::is_ convertibl e<Sequence ,   nil
>
32                {};   32                {};
33           };   33           };
34       }   34       }
35   }}   35   }}
36     36  
37   #endif   37   #endif