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/support/vector.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/phoenix/support/vector.hpp')
| -rw-r--r-- | 3rdParty/Boost/src/boost/phoenix/support/vector.hpp | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/3rdParty/Boost/src/boost/phoenix/support/vector.hpp b/3rdParty/Boost/src/boost/phoenix/support/vector.hpp index 82ec6af..6899d85 100644 --- a/3rdParty/Boost/src/boost/phoenix/support/vector.hpp +++ b/3rdParty/Boost/src/boost/phoenix/support/vector.hpp @@ -1,3 +1,9 @@ +#ifdef BOOST_MSVC +#pragma warning(push) +#pragma warning(disable: 4512) // assignment operator could not be generated +#pragma warning(disable: 4510) // default constructor could not be generated +#pragma warning(disable: 4610) // can never be instantiated - user defined constructor required +#endif #if !defined(BOOST_PHOENIX_DONT_USE_PREPROCESSED_FILES) #ifndef BOOST_PHOENIX_SUPPORT_VECTOR_HPP @@ -132,3 +138,7 @@ BOOST_FUSION_ADAPT_TPL_STRUCT_NO_PARTIAL( #endif #endif + +#ifdef BOOST_MSVC +#pragma warning(pop) +#endif |