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/phoenix/version.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/phoenix/version.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/phoenix/version.hpp | 18 |
1 files changed, 16 insertions, 2 deletions
diff --git a/3rdParty/Boost/src/boost/phoenix/version.hpp b/3rdParty/Boost/src/boost/phoenix/version.hpp index 9b3fd04..41166f5 100644 --- a/3rdParty/Boost/src/boost/phoenix/version.hpp +++ b/3rdParty/Boost/src/boost/phoenix/version.hpp @@ -2,6 +2,7 @@ Copyright (c) 2005-2008 Hartmut Kaiser Copyright (c) 2005-2010 Joel de Guzman + Copyright (c) 2014 John Fletcher - Distributed under the Boost Software License, Version 1.0. (See accompanying + 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) ==============================================================================*/ @@ -14,5 +15,18 @@ // /////////////////////////////////////////////////////////////////////////////// -#define BOOST_PHOENIX_VERSION 0x3000 // 3.0.0 +#define BOOST_PHOENIX_VERSION 0x3006 // 3.0.6 + +// boost/predef is not in Boost before 1.55.0 +#include <boost/version.hpp> +#if BOOST_VERSION >= 105500 +// Also note that it has a nonstandard header which could change, +// so I have not relied on its own internal define. +#include <boost/predef.h> +#define BOOST_PHOENIX_HAVE_BOOST_PREDEF +#endif + +#ifdef BOOST_PHOENIX_HAVE_BOOST_PREDEF +#define BOOST_PHOENIX_VERSION_NUMBER = BOOST_VERSION_NUMBER(3,0,6) +#endif #endif |