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/print.hpp | |
| parent | 38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff) | |
| download | swift-contrib-6b22dfcf59474dd016a0355a3102a1dd3692d92c.zip swift-contrib-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/print.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/mpl/print.hpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/3rdParty/Boost/src/boost/mpl/print.hpp b/3rdParty/Boost/src/boost/mpl/print.hpp index c726fac..e3b0d31 100644 --- a/3rdParty/Boost/src/boost/mpl/print.hpp +++ b/3rdParty/Boost/src/boost/mpl/print.hpp @@ -1,74 +1,75 @@ #ifndef BOOST_MPL_PRINT_HPP_INCLUDED #define BOOST_MPL_PRINT_HPP_INCLUDED // Copyright David Abrahams 2003 // Copyright Aleksey Gurtovoy 2004 // // Distributed under the Boost Software License, Version 1.0. // (See accompanying file LICENSE_1_0.txt or copy at // http://www.boost.org/LICENSE_1_0.txt) // // See http://www.boost.org/libs/mpl for documentation. -// $Id: print.hpp 49267 2008-10-11 06:19:02Z agurtovoy $ -// $Date: 2008-10-10 23:19:02 -0700 (Fri, 10 Oct 2008) $ -// $Revision: 49267 $ +// $Id$ +// $Date$ +// $Revision$ #include <boost/mpl/aux_/config/msvc.hpp> #include <boost/mpl/identity.hpp> namespace boost { namespace mpl { namespace aux { #if defined(BOOST_MSVC) # pragma warning(push, 3) // we only want one warning from MSVC, so turn off the other one # pragma warning(disable: 4307) #elif defined(__MWERKS__) # pragma warn_hidevirtual on struct print_base { virtual void f() {} }; #endif #if defined(__EDG_VERSION__) template <class T> struct dependent_unsigned { static const unsigned value = 1; }; #endif -} // namespace aux - +} // namespace aux template <class T> struct print : mpl::identity<T> #if defined(__MWERKS__) , aux::print_base #endif { -#if defined(BOOST_MSVC) +#if defined(__clang__) + const int m_x = 1 / (sizeof(T) - sizeof(T)); +#elif defined(BOOST_MSVC) enum { n = sizeof(T) + -1 }; #elif defined(__MWERKS__) void f(int); #else enum { n = # if defined(__EDG_VERSION__) aux::dependent_unsigned<T>::value > -1 # else sizeof(T) > -1 # endif }; #endif }; #if defined(BOOST_MSVC) # pragma warning(pop) #elif defined(__MWERKS__) # pragma warn_hidevirtual reset #endif }} #endif // BOOST_MPL_PRINT_HPP_INCLUDED |