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

16.1 Files compared

# Location File Last Modified
1 D:\P\boost_1_47_0\boost\phoenix\core\detail phx2_result.hpp Fri Nov 11 15:08:32 2011 UTC
2 D:\P\boost_1_47_0_native\boost\phoenix\core\detail phx2_result.hpp Tue May 10 01:41:02 2011 UTC

16.2 Comparison summary

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

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

16.4 Active regular expressions

No regular expressions were active.

16.5 Comparison detail

1   /*======== ========== ========== ========== ========== ========== ========== =========   1   /*======== ========== ========== ========== ========== ========== ========== =========
2       Copyri ght (c) 20 11 Thomas  Heller   2       Copyri ght (c) 20 11 Thomas  Heller
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 !BOOST _PHOENIX_I S_ITERATIN G   7   #if !BOOST _PHOENIX_I S_ITERATIN G
8   #ifndef BO OST_PHOENI X_CORE_DET AIL_PHX2_R ESULT_HPP   8   #ifndef BO OST_PHOENI X_CORE_DET AIL_PHX2_R ESULT_HPP
9   #define BO OST_PHOENI X_CORE_DET AIL_PHX2_R ESULT_HPP   9   #define BO OST_PHOENI X_CORE_DET AIL_PHX2_R ESULT_HPP
10   #include < boost/phoe nix/core/l imits.hpp>   10   #include < boost/phoe nix/core/l imits.hpp>
11   #include < boost/phoe nix/suppor t/iterate. hpp>   11   #include < boost/phoe nix/suppor t/iterate. hpp>
12   #include < boost/mpl/ has_xxx.hp p>   12   #include < boost/mpl/ has_xxx.hp p>
13     13  
14   namespace  boost { na mespace ph oenix {   14   namespace  boost { na mespace ph oenix {
15       namesp ace detail   15       namesp ace detail
16       {   16       {
17           BO OST_MPL_HA S_XXX_TRAI T_DEF(resu lt_type)   17           BO OST_MPL_HA S_XXX_TRAI T_DEF(resu lt_type)
18     18  
19           te mplate <ty pename Res ult>   19           te mplate <ty pename Res ult>
20           st ruct has_p hx2_result _impl   20           st ruct has_p hx2_result _impl
21           {   21           {
22                typedef  char yes;   22                typedef  char yes;
23                typedef  char (&no) [2];   23                typedef  char (&no) [2];
24     24  
25                template  <typename  A>   25                template  <typename  A>
26                 static   yes   check   BOOST_PREV ENT_MACRO_ SUBSTITUTI ON (typename   A::type   *);   26                 static   yes   check
(typename   A::type   *);
27                   27                
28                   28                
29                template  <typename  A>   29                template  <typename  A>
30                 static   no   check   BOOST_PREV ENT_MACRO_ SUBSTITUTI ON (...);   30                 static   no   check
(...);
31     31  
32                static b ool const  value = (s izeof(yes)  == sizeof (check<Res ult>(0)));   32                static b ool const  value = (s izeof(yes)  == sizeof (check<Res ult>(0)));
33                typedef  boost::mpl ::bool_<va lue> type;   33                typedef  boost::mpl ::bool_<va lue> type;
34           };   34           };
35     35  
36           te mplate <ty pename F,  BOOST_PHOE NIX_typena me_A_void( BOOST_PP_D EC(BOOST_P HOENIX_COM POSITE_LIM IT)), type name Dummy  = void>   36           te mplate <ty pename F,  BOOST_PHOE NIX_typena me_A_void( BOOST_PP_D EC(BOOST_P HOENIX_COM POSITE_LIM IT)), type name Dummy  = void>
37           st ruct has_p hx2_result   37           st ruct has_p hx2_result
38                : mpl::f alse_   38                : mpl::f alse_
39           {} ;   39           {} ;
40     40  
41           te mplate <ty pename F,  BOOST_PHOE NIX_typena me_A_void( BOOST_PP_D EC(BOOST_P HOENIX_COM POSITE_LIM IT)), type name Dummy  = void>   41           te mplate <ty pename F,  BOOST_PHOE NIX_typena me_A_void( BOOST_PP_D EC(BOOST_P HOENIX_COM POSITE_LIM IT)), type name Dummy  = void>
42           st ruct phx2_ result;   42           st ruct phx2_ result;
43   #if !defin ed(BOOST_P HOENIX_DON T_USE_PREP ROCESSED_F ILES)   43   #if !defin ed(BOOST_P HOENIX_DON T_USE_PREP ROCESSED_F ILES)
44   #include < boost/phoe nix/core/d etail/prep rocessed/p hx2_result .hpp>   44   #include < boost/phoe nix/core/d etail/prep rocessed/p hx2_result .hpp>
45   #else   45   #else
46   #if define d(__WAVE__ ) && defin ed(BOOST_P HOENIX_CRE ATE_PREPRO CESSED_FIL ES)   46   #if define d(__WAVE__ ) && defin ed(BOOST_P HOENIX_CRE ATE_PREPRO CESSED_FIL ES)
47   #pragma wa ve option( preserve:  2, line: 0 , output:  "preproces sed/phx2_r esult_" BO OST_PHOENI X_LIMIT_ST R ".hpp")   47   #pragma wa ve option( preserve:  2, line: 0 , output:  "preproces sed/phx2_r esult_" BO OST_PHOENI X_LIMIT_ST R ".hpp")
48   #endif   48   #endif
49   /*======== ========== ========== ========== ========== ========== ========== =========   49   /*======== ========== ========== ========== ========== ========== ========== =========
50       Copyri ght (c) 20 11 Thomas  Heller   50       Copyri ght (c) 20 11 Thomas  Heller
51     51  
52       Distri buted unde r the Boos t Software  License,  Version 1. 0. (See ac companying   52       Distri buted unde r the Boos t Software  License,  Version 1. 0. (See ac companying
53       file L ICENSE_1_0 .txt or co py at http ://www.boo st.org/LIC ENSE_1_0.t xt)   53       file L ICENSE_1_0 .txt or co py at http ://www.boo st.org/LIC ENSE_1_0.t xt)
54   ========== ========== ========== ========== ========== ========== ========== ========*/   54   ========== ========== ========== ========== ========== ========== ========== ========*/
55   #if define d(__WAVE__ ) && defin ed(BOOST_P HOENIX_CRE ATE_PREPRO CESSED_FIL ES)   55   #if define d(__WAVE__ ) && defin ed(BOOST_P HOENIX_CRE ATE_PREPRO CESSED_FIL ES)
56   #pragma wa ve option( preserve:  1)   56   #pragma wa ve option( preserve:  1)
57   #endif   57   #endif
58     58  
59     59  
60           #d efine BOOS T_PHOENIX_ ITERATION_ PARAMS                                      \   60           #d efine BOOS T_PHOENIX_ ITERATION_ PARAMS                                      \
61                (3, (1,  BOOST_PP_D EC(BOOST_P HOENIX_COM POSITE_LIM IT),                  \   61                (3, (1,  BOOST_PP_D EC(BOOST_P HOENIX_COM POSITE_LIM IT),                  \
62                <boost/p hoenix/cor e/detail/p hx2_result .hpp>))   62                <boost/p hoenix/cor e/detail/p hx2_result .hpp>))
63   #include B OOST_PHOEN IX_ITERATE ()   63   #include B OOST_PHOEN IX_ITERATE ()
64     64  
65   #if define d(__WAVE__ ) && defin ed(BOOST_P HOENIX_CRE ATE_PREPRO CESSED_FIL ES)   65   #if define d(__WAVE__ ) && defin ed(BOOST_P HOENIX_CRE ATE_PREPRO CESSED_FIL ES)
66   #pragma wa ve option( output: nu ll)   66   #pragma wa ve option( output: nu ll)
67   #endif   67   #endif
68     68  
69   #endif   69   #endif
70       }   70       }
71   }}   71   }}
72     72  
73   #endif   73   #endif
74     74  
75   #else   75   #else
76     76  
77           te mplate <ty pename F,  BOOST_PHOE NIX_typena me_A>   77           te mplate <ty pename F,  BOOST_PHOE NIX_typena me_A>
78           st ruct has_p hx2_result <F, BOOST_ PHOENIX_A>   78           st ruct has_p hx2_result <F, BOOST_ PHOENIX_A>
79                : mpl::e val_if<   79                : mpl::e val_if<
80                    has_ result_typ e<F>   80                    has_ result_typ e<F>
81                  , mpl: :false_   81                  , mpl: :false_
82                  , has_ phx2_resul t_impl<typ ename F::t emplate re sult<F(BOO ST_PHOENIX _A)> >   82                  , has_ phx2_resul t_impl<typ ename F::t emplate re sult<F(BOO ST_PHOENIX _A)> >
83                >::type   83                >::type
84           {} ;   84           {} ;
85     85  
86     86  
87           te mplate <ty pename F,  BOOST_PHOE NIX_typena me_A>   87           te mplate <ty pename F,  BOOST_PHOE NIX_typena me_A>
88           st ruct phx2_ result<F,  BOOST_PHOE NIX_A>   88           st ruct phx2_ result<F,  BOOST_PHOE NIX_A>
89           {   89           {
90                typedef  typename F ::template  result<BO OST_PHOENI X_A>::type  type;   90                typedef  typename F ::template  result<BO OST_PHOENI X_A>::type  type;
91           };   91           };
92              92           
93           te mplate <ty pename F,  BOOST_PHOE NIX_typena me_A>   93           te mplate <ty pename F,  BOOST_PHOE NIX_typena me_A>
94           st ruct phx2_ result<F,  BOOST_PHOE NIX_A_ref>   94           st ruct phx2_ result<F,  BOOST_PHOE NIX_A_ref>
95           {   95           {
96                typedef  typename F ::template  result<BO OST_PHOENI X_A>::type  type;   96                typedef  typename F ::template  result<BO OST_PHOENI X_A>::type  type;
97           };   97           };
98              98           
99           te mplate <ty pename F,  BOOST_PHOE NIX_typena me_A>   99           te mplate <ty pename F,  BOOST_PHOE NIX_typena me_A>
100           st ruct phx2_ result<F,  BOOST_PHOE NIX_A_cons t_ref>   100           st ruct phx2_ result<F,  BOOST_PHOE NIX_A_cons t_ref>
101           {   101           {
102                typedef  typename F ::template  result<BO OST_PHOENI X_A>::type  type;   102                typedef  typename F ::template  result<BO OST_PHOENI X_A>::type  type;
103           };   103           };
104     104  
105   #endif   105   #endif