feedc0de/boost_mpl
1
0
Fork 0
forked from boostorg/mpl
Code Pull Requests Activity

Merged revisions 59248 via svnmerge from

Browse Source 
https://svn.boost.org/svn/boost/trunk

........
  r59248 | agurtovoy | 2010-01-23 23:45:36 -0600 (Sat, 23 Jan 2010) | 1 line
  
  Fix bitand/bitor conflicts with iso64.h header
........


[SVN r63520]
This commit is contained in:
Aleksey Gurtovoy
2010-07-02 08:59:55 +00:00
parent ea638a4478
commit 315ad7d60d
2 changed files with 46 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
include/boost/mpl/bitand.hpp
View File

@@ -2,7 +2,7 @@
#ifndef BOOST_MPL_BITAND_HPP_INCLUDED #ifndef BOOST_MPL_BITAND_HPP_INCLUDED
#define BOOST_MPL_BITAND_HPP_INCLUDED #define BOOST_MPL_BITAND_HPP_INCLUDED
// Copyright Aleksey Gurtovoy 2000-2004 // Copyright Aleksey Gurtovoy 2000-2009
// Copyright Jaap Suter 2003 // Copyright Jaap Suter 2003
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
@@ -15,9 +15,31 @@
// $Date$ // $Date$
// $Revision$ // $Revision$
// agurt, 23/jan/10: workaround a conflict with <iso646.h> header's
// macros, see http://tinyurl.com/ycwdxco; 'defined(bitand)'
// has to be checked in a separate condition, otherwise GCC complains
// about 'bitand' being an alternative token
#if defined(_MSC_VER)
#ifndef __GCCXML__
#if defined(bitand)
# pragma push_macro("bitand")
# undef bitand
# define bitand(x)
#endif
#endif
#endif
#define AUX778076_OP_NAME bitand_ #define AUX778076_OP_NAME bitand_
#define AUX778076_OP_PREFIX bitand #define AUX778076_OP_PREFIX bitand
#define AUX778076_OP_TOKEN & #define AUX778076_OP_TOKEN &
#include <boost/mpl/aux_/arithmetic_op.hpp> #include <boost/mpl/aux_/arithmetic_op.hpp>
#if defined(_MSC_VER)
#ifndef __GCCXML__
#if defined(bitand)
# pragma pop_macro("bitand")
#endif
#endif
#endif
#endif // BOOST_MPL_BITAND_HPP_INCLUDED #endif // BOOST_MPL_BITAND_HPP_INCLUDED

24
include/boost/mpl/bitor.hpp
View File

@@ -2,7 +2,7 @@
#ifndef BOOST_MPL_BITOR_HPP_INCLUDED #ifndef BOOST_MPL_BITOR_HPP_INCLUDED
#define BOOST_MPL_BITOR_HPP_INCLUDED #define BOOST_MPL_BITOR_HPP_INCLUDED
// Copyright Aleksey Gurtovoy 2000-2004 // Copyright Aleksey Gurtovoy 2000-2009
// Copyright Jaap Suter 2003 // Copyright Jaap Suter 2003
// //
// Distributed under the Boost Software License, Version 1.0. // Distributed under the Boost Software License, Version 1.0.
@@ -15,9 +15,31 @@
// $Date$ // $Date$
// $Revision$ // $Revision$
// agurt, 23/jan/10: workaround a conflict with <iso646.h> header's
// macros, see http://tinyurl.com/ycwdxco; 'defined(bitor)'
// has to be checked in a separate condition, otherwise GCC complains
// about 'bitor' being an alternative token
#if defined(_MSC_VER)
#ifndef __GCCXML__
#if defined(bitor)
# pragma push_macro("bitor")
# undef bitor
# define bitor(x)
#endif
#endif
#endif
#define AUX778076_OP_NAME bitor_ #define AUX778076_OP_NAME bitor_
#define AUX778076_OP_PREFIX bitor #define AUX778076_OP_PREFIX bitor
#define AUX778076_OP_TOKEN | #define AUX778076_OP_TOKEN |
#include <boost/mpl/aux_/arithmetic_op.hpp> #include <boost/mpl/aux_/arithmetic_op.hpp>
#if defined(_MSC_VER)
#ifndef __GCCXML__
#if defined(bitor)
# pragma pop_macro("bitor")
#endif
#endif
#endif
#endif // BOOST_MPL_BITOR_HPP_INCLUDED #endif // BOOST_MPL_BITOR_HPP_INCLUDED