| 1 | *** or.hpp 2011-11-04 18:36:06.621873000 -0400
|
|---|
| 2 | --- /software/lib/WIN32-x86/2010/boost_1.37.0/include/boost/mpl/or.hpp 2009-06-04 03:32:00.000000000 -0400
|
|---|
| 3 | ***************
|
|---|
| 4 | *** 29,37 ****
|
|---|
| 5 | // 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(or)'
|
|---|
| 6 | // has to be checked in a separate condition, otherwise GCC complains
|
|---|
| 7 | // about 'or' being an alternative token
|
|---|
| 8 | - // Exclude gnu tools under this condition - Karthik Rajagopalan
|
|---|
| 9 | #if defined(_MSC_VER)
|
|---|
| 10 | ! #if !defined(__GCCXML__) && !defined(__GNUC__)
|
|---|
| 11 | #if defined(or)
|
|---|
| 12 | # pragma push_macro("or")
|
|---|
| 13 | # undef or
|
|---|
| 14 | --- 29,36 ----
|
|---|
| 15 | // 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(or)'
|
|---|
| 16 | // has to be checked in a separate condition, otherwise GCC complains
|
|---|
| 17 | // about 'or' being an alternative token
|
|---|
| 18 | #if defined(_MSC_VER)
|
|---|
| 19 | ! #ifndef __GCCXML__
|
|---|
| 20 | #if defined(or)
|
|---|
| 21 | # pragma push_macro("or")
|
|---|
| 22 | # undef or
|
|---|
| 23 | ***************
|
|---|
| 24 | *** 43,50 ****
|
|---|
| 25 | # define BOOST_MPL_PREPROCESSED_HEADER or.hpp
|
|---|
| 26 | # include <boost/mpl/aux_/include_preprocessed.hpp>
|
|---|
| 27 |
|
|---|
| 28 | ! #if defined(_MSC_VER)
|
|---|
| 29 | ! #if !defined(__GCCXML__) && !defined(__GNUC__)
|
|---|
| 30 | #if defined(or)
|
|---|
| 31 | # pragma pop_macro("or")
|
|---|
| 32 | #endif
|
|---|
| 33 | --- 42,49 ----
|
|---|
| 34 | # define BOOST_MPL_PREPROCESSED_HEADER or.hpp
|
|---|
| 35 | # include <boost/mpl/aux_/include_preprocessed.hpp>
|
|---|
| 36 |
|
|---|
| 37 | ! #if defined(_MSC_VER)
|
|---|
| 38 | ! #ifndef __GCCXML__
|
|---|
| 39 | #if defined(or)
|
|---|
| 40 | # pragma pop_macro("or")
|
|---|
| 41 | #endif
|
|---|
| 42 | *** and.hpp 2011-11-04 18:35:24.051426000 -0400
|
|---|
| 43 | --- /software/lib/WIN32-x86/2010/boost_1.37.0/include/boost/mpl/and.hpp 2009-06-04 03:31:59.000000000 -0400
|
|---|
| 44 | ***************
|
|---|
| 45 | *** 28,36 ****
|
|---|
| 46 | // 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(and)'
|
|---|
| 47 | // has to be checked in a separate condition, otherwise GCC complains
|
|---|
| 48 | // about 'and' being an alternative token
|
|---|
| 49 | - // Exclude gnu tools under this condition - Karthik Rajagopalan
|
|---|
| 50 | #if defined(_MSC_VER)
|
|---|
| 51 | ! #if !defined(__GCCXML__) && !defined(__GNUC__)
|
|---|
| 52 | #if defined(and)
|
|---|
| 53 | # pragma push_macro("and")
|
|---|
| 54 | # undef and
|
|---|
| 55 | --- 28,35 ----
|
|---|
| 56 | // 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(and)'
|
|---|
| 57 | // has to be checked in a separate condition, otherwise GCC complains
|
|---|
| 58 | // about 'and' being an alternative token
|
|---|
| 59 | #if defined(_MSC_VER)
|
|---|
| 60 | ! #ifndef __GCCXML__
|
|---|
| 61 | #if defined(and)
|
|---|
| 62 | # pragma push_macro("and")
|
|---|
| 63 | # undef and
|
|---|
| 64 | ***************
|
|---|
| 65 | *** 43,49 ****
|
|---|
| 66 | # include <boost/mpl/aux_/include_preprocessed.hpp>
|
|---|
| 67 |
|
|---|
| 68 | #if defined(_MSC_VER)
|
|---|
| 69 | ! #if !defined(__GCCXML__) && !defined(__GNUC__)
|
|---|
| 70 | #if defined(and)
|
|---|
| 71 | # pragma pop_macro("and")
|
|---|
| 72 | #endif
|
|---|
| 73 | --- 42,48 ----
|
|---|
| 74 | # include <boost/mpl/aux_/include_preprocessed.hpp>
|
|---|
| 75 |
|
|---|
| 76 | #if defined(_MSC_VER)
|
|---|
| 77 | ! #ifndef __GCCXML__
|
|---|
| 78 | #if defined(and)
|
|---|
| 79 | # pragma pop_macro("and")
|
|---|
| 80 | #endif
|
|---|
