*** or.hpp	2011-11-04 18:36:06.621873000 -0400
--- /software/lib/WIN32-x86/2010/boost_1.37.0/include/boost/mpl/or.hpp	2009-06-04 03:32:00.000000000 -0400
***************
*** 29,37 ****
  // 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(or)'
  // has to be checked in a separate condition, otherwise GCC complains 
  // about 'or' being an alternative token
- // Exclude gnu tools under this condition - Karthik Rajagopalan
  #if defined(_MSC_VER)
! #if !defined(__GCCXML__) && !defined(__GNUC__)
  #if defined(or)
  #   pragma push_macro("or")
  #   undef or
--- 29,36 ----
  // 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(or)'
  // has to be checked in a separate condition, otherwise GCC complains 
  // about 'or' being an alternative token
  #if defined(_MSC_VER)
! #ifndef __GCCXML__
  #if defined(or)
  #   pragma push_macro("or")
  #   undef or
***************
*** 43,50 ****
  #   define BOOST_MPL_PREPROCESSED_HEADER or.hpp
  #   include <boost/mpl/aux_/include_preprocessed.hpp>
  
! #if defined(_MSC_VER)
! #if !defined(__GCCXML__) && !defined(__GNUC__)
  #if defined(or)
  #   pragma pop_macro("or")
  #endif
--- 42,49 ----
  #   define BOOST_MPL_PREPROCESSED_HEADER or.hpp
  #   include <boost/mpl/aux_/include_preprocessed.hpp>
  
! #if defined(_MSC_VER) 
! #ifndef __GCCXML__
  #if defined(or)
  #   pragma pop_macro("or")
  #endif
*** and.hpp	2011-11-04 18:35:24.051426000 -0400
--- /software/lib/WIN32-x86/2010/boost_1.37.0/include/boost/mpl/and.hpp	2009-06-04 03:31:59.000000000 -0400
***************
*** 28,36 ****
  // 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(and)'
  // has to be checked in a separate condition, otherwise GCC complains 
  // about 'and' being an alternative token
- // Exclude gnu tools under this condition - Karthik Rajagopalan
  #if defined(_MSC_VER) 
! #if !defined(__GCCXML__) && !defined(__GNUC__)
  #if defined(and) 
  #   pragma push_macro("and")
  #   undef and
--- 28,35 ----
  // 'or' and 'and' macros, see http://tinyurl.com/3et69; 'defined(and)'
  // has to be checked in a separate condition, otherwise GCC complains 
  // about 'and' being an alternative token
  #if defined(_MSC_VER) 
! #ifndef __GCCXML__
  #if defined(and) 
  #   pragma push_macro("and")
  #   undef and
***************
*** 43,49 ****
  #   include <boost/mpl/aux_/include_preprocessed.hpp>
  
  #if defined(_MSC_VER)
! #if !defined(__GCCXML__) && !defined(__GNUC__)
  #if defined(and) 
  #   pragma pop_macro("and")
  #endif
--- 42,48 ----
  #   include <boost/mpl/aux_/include_preprocessed.hpp>
  
  #if defined(_MSC_VER)
! #ifndef __GCCXML__
  #if defined(and) 
  #   pragma pop_macro("and")
  #endif