summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTobias Markmann <tm@ayena.de>2014-10-19 20:22:58 (GMT)
committerTobias Markmann <tm@ayena.de>2014-10-20 13:49:33 (GMT)
commit6b22dfcf59474dd016a0355a3102a1dd3692d92c (patch)
tree2b1fd33be433a91e81fee84fdc2bf1b52575d934 /3rdParty/Boost/src/boost/signals/detail
parent38b0cb785fea8eae5e48fae56440695fdfd10ee1 (diff)
downloadswift-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/signals/detail')
-rw-r--r--3rdParty/Boost/src/boost/signals/detail/named_slot_map.hpp3
-rw-r--r--3rdParty/Boost/src/boost/signals/detail/signal_base.hpp2
-rw-r--r--3rdParty/Boost/src/boost/signals/detail/signals_common.hpp18
3 files changed, 2 insertions, 21 deletions
diff --git a/3rdParty/Boost/src/boost/signals/detail/named_slot_map.hpp b/3rdParty/Boost/src/boost/signals/detail/named_slot_map.hpp
index 88625fa..3f7cf1c 100644
--- a/3rdParty/Boost/src/boost/signals/detail/named_slot_map.hpp
+++ b/3rdParty/Boost/src/boost/signals/detail/named_slot_map.hpp
@@ -13,7 +13,6 @@
#include <boost/signals/detail/config.hpp>
#include <boost/signals/detail/signals_common.hpp>
#include <boost/signals/connection.hpp>
-#include <boost/utility.hpp>
#include <boost/shared_ptr.hpp>
#include <boost/function/function2.hpp>
#include <boost/iterator/iterator_facade.hpp>
@@ -127,7 +126,7 @@ public:
|| slot_ == other.slot_));
}
-#if BOOST_WORKAROUND(_MSC_VER, <= 1700)
+#if BOOST_WORKAROUND(_MSC_VER, <= 1900)
void decrement();
void advance(difference_type);
#endif
diff --git a/3rdParty/Boost/src/boost/signals/detail/signal_base.hpp b/3rdParty/Boost/src/boost/signals/detail/signal_base.hpp
index 0438cf7..991e9fc 100644
--- a/3rdParty/Boost/src/boost/signals/detail/signal_base.hpp
+++ b/3rdParty/Boost/src/boost/signals/detail/signal_base.hpp
@@ -17,7 +17,7 @@
#include <boost/signals/trackable.hpp>
#include <boost/signals/slot.hpp>
#include <boost/smart_ptr.hpp>
-#include <boost/utility.hpp>
+#include <boost/noncopyable.hpp>
#include <boost/function/function2.hpp>
#include <utility>
#include <vector>
diff --git a/3rdParty/Boost/src/boost/signals/detail/signals_common.hpp b/3rdParty/Boost/src/boost/signals/detail/signals_common.hpp
index fe1a5a1..9cf078d 100644
--- a/3rdParty/Boost/src/boost/signals/detail/signals_common.hpp
+++ b/3rdParty/Boost/src/boost/signals/detail/signals_common.hpp
@@ -97,7 +97,6 @@ namespace boost {
};
// Determine if the incoming argument is a reference_wrapper
-#ifndef BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
template<typename T>
struct is_ref
{
@@ -109,23 +108,6 @@ namespace boost {
{
BOOST_STATIC_CONSTANT(bool, value = true);
};
-#else // no partial specialization
- typedef char yes_type;
- typedef double no_type;
-
- no_type is_ref_tester(...);
-
- template<typename T>
- yes_type is_ref_tester(reference_wrapper<T>*);
-
- template<typename T>
- struct is_ref
- {
- static T* t;
- BOOST_STATIC_CONSTANT(bool,
- value = (sizeof(is_ref_tester(t)) == sizeof(yes_type)));
- };
-#endif // BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION
// A slot can be a signal, a reference to a function object, or a
// function object.