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/serialization/pfto.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/serialization/pfto.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/serialization/pfto.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/3rdParty/Boost/src/boost/serialization/pfto.hpp b/3rdParty/Boost/src/boost/serialization/pfto.hpp index 8d98463..0370d28 100644 --- a/3rdParty/Boost/src/boost/serialization/pfto.hpp +++ b/3rdParty/Boost/src/boost/serialization/pfto.hpp @@ -1,40 +1,40 @@ #ifndef BOOST_SERIALIZATION_PFTO_HPP #define BOOST_SERIALIZATION_PFTO_HPP // MS compatible compilers support #pragma once -#if defined(_MSC_VER) && (_MSC_VER >= 1020) +#if defined(_MSC_VER) # pragma once #endif /////////1/////////2/////////3/////////4/////////5/////////6/////////7/////////8 // pfto.hpp: workarounds for compilers which have problems supporting // Partial Function Template Ordering (PFTO). // (C) Copyright 2002 Robert Ramey - http://www.rrsd.com . // Use, modification and distribution is subject to 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/serialization for updates, documentation, and revision history. // PFTO version is used to specify the last argument of certain functions // Function it is used to support compilers that fail to support correct Partial // Template Ordering #include <boost/config.hpp> // some compilers can use an exta argument and use function overloading // to choose desired function. This extra argument is long in the default // function implementation and int for the rest. The function is called // with an int argument. This first attempts to match functions with an // int argument before the default one (with a long argument). This is // known to function with VC 6.0. On other compilers this fails (Borland) // or causes other problems (GCC). note: this #if defined(BOOST_NO_FUNCTION_TEMPLATE_ORDERING) #define BOOST_PFTO long #else #define BOOST_PFTO #endif // here's another approach. Rather than use a default function - make sure // there is no default at all by requiring that all function invocations // have a "wrapped" argument type. This solves a problem with VC 6.0 |