Swiftdiff options
| author | Tobias Markmann <tm@ayena.de> | 2014-10-19 20:22:58 (GMT) |
|---|---|---|
| committer | Tobias Markmann <tm@ayena.de> | 2014-10-20 13:49:33 (GMT) |
| commit | 6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch) | |
| tree | 2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/mpl/bitand.hpp | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-6b22dfcf59474dd016a0355a3102a1dd3692d92c.tar.bz2 | |
Update Boost in 3rdParty to version 1.56.0.
This updates Boost in our 3rdParty directory to version 1.56.0.
Updated our update.sh script to stop on error.
Changed error reporting in SwiftTools/CrashReporter.cpp to SWIFT_LOG due to
missing include of <iostream> with newer Boost.
Change-Id: I4b35c77de951333979a524097f35f5f83d325edc
Diffstat (limited to '3rdParty/Boost/src/boost/mpl/bitand.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/mpl/bitand.hpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/3rdParty/Boost/src/boost/mpl/bitand.hpp b/3rdParty/Boost/src/boost/mpl/bitand.hpp index 7292569..9c31c79 100644 --- a/3rdParty/Boost/src/boost/mpl/bitand.hpp +++ b/3rdParty/Boost/src/boost/mpl/bitand.hpp @@ -11,15 +11,15 @@ // // See http://www.boost.org/libs/mpl for documentation. -// $Id: bitand.hpp 63520 2010-07-02 08:59:55Z agurtovoy $ -// $Date: 2010-07-02 01:59:55 -0700 (Fri, 02 Jul 2010) $ -// $Revision: 63520 $ +// $Id$ +// $Date$ +// $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) +#if defined(_MSC_VER) && !defined(__clang__) #ifndef __GCCXML__ #if defined(bitand) # pragma push_macro("bitand") @@ -34,7 +34,7 @@ #define AUX778076_OP_TOKEN & #include <boost/mpl/aux_/arithmetic_op.hpp> -#if defined(_MSC_VER) +#if defined(_MSC_VER) && !defined(__clang__) #ifndef __GCCXML__ #if defined(bitand) # pragma pop_macro("bitand") |