summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemko Tronçon <git@el-tramo.be>2011-03-14 18:35:17 (GMT)
committerRemko Tronçon <git@el-tramo.be>2011-03-14 18:35:17 (GMT)
commita135c6ff4dcded5661a2321512960b14cf8c15c8 (patch)
treeb0017ecfe702304f592b9d4e8b943784cff26fb2 /3rdParty/Boost/src/boost/signals
parent02d6188ab335e6c62b8341b84579d9549d215118 (diff)
downloadswift-a135c6ff4dcded5661a2321512960b14cf8c15c8.zip
swift-a135c6ff4dcded5661a2321512960b14cf8c15c8.tar.bz2
Updated Boost to 1.46.1.
This should hopefuily fix a hang on shutdown on Mac OS X. Resolves: #782 Release-Notes: Fixed a potential hang on shutdown on Mac OS X.
Diffstat (limited to '3rdParty/Boost/src/boost/signals')
-rw-r--r--3rdParty/Boost/src/boost/signals/detail/named_slot_map.hpp12
-rw-r--r--3rdParty/Boost/src/boost/signals/detail/slot_call_iterator.hpp4
-rw-r--r--3rdParty/Boost/src/boost/signals/signal_template.hpp8
3 files changed, 12 insertions, 12 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 0528c61..763013f 100644
--- a/3rdParty/Boost/src/boost/signals/detail/named_slot_map.hpp
+++ b/3rdParty/Boost/src/boost/signals/detail/named_slot_map.hpp
@@ -32,10 +32,10 @@ class stored_group
public:
enum storage_kind { sk_empty, sk_front, sk_back, sk_group };
- stored_group(storage_kind kind = sk_empty) : kind(kind), group() { }
+ stored_group(storage_kind p_kind = sk_empty) : kind(p_kind), group() { }
template<typename T>
- stored_group(const T& group) : kind(sk_group), group(new T(group)) { }
+ stored_group(const T& p_group) : kind(sk_group), group(new T(p_group)) { }
bool is_front() const { return kind == sk_front; }
bool is_back() const { return kind == sk_back; }
@@ -133,12 +133,12 @@ public:
#endif
private:
- named_slot_map_iterator(group_iterator group, group_iterator last) :
- group(group), last_group(last), slot_assigned(false)
+ named_slot_map_iterator(group_iterator giter, group_iterator last) :
+ group(giter), last_group(last), slot_assigned(false)
{ init_next_group(); }
- named_slot_map_iterator(group_iterator group, group_iterator last,
+ named_slot_map_iterator(group_iterator giter, group_iterator last,
slot_pair_iterator slot) :
- group(group), last_group(last), slot_(slot), slot_assigned(true)
+ group(giter), last_group(last), slot_(slot), slot_assigned(true)
{ }
void init_next_group()
diff --git a/3rdParty/Boost/src/boost/signals/detail/slot_call_iterator.hpp b/3rdParty/Boost/src/boost/signals/detail/slot_call_iterator.hpp
index c6706be..0d6afd9 100644
--- a/3rdParty/Boost/src/boost/signals/detail/slot_call_iterator.hpp
+++ b/3rdParty/Boost/src/boost/signals/detail/slot_call_iterator.hpp
@@ -47,9 +47,9 @@ namespace boost {
friend class iterator_core_access;
public:
- slot_call_iterator(Iterator iter_in, Iterator end_in, Function f,
+ slot_call_iterator(Iterator iter_in, Iterator end_in, Function func,
optional<result_type> &c)
- : iter(iter_in), end(end_in), f(f), cache(&c)
+ : iter(iter_in), end(end_in), f(func), cache(&c)
{
iter = std::find_if(iter, end, is_callable());
}
diff --git a/3rdParty/Boost/src/boost/signals/signal_template.hpp b/3rdParty/Boost/src/boost/signals/signal_template.hpp
index a8420b6..6b0b91a 100644
--- a/3rdParty/Boost/src/boost/signals/signal_template.hpp
+++ b/3rdParty/Boost/src/boost/signals/signal_template.hpp
@@ -345,8 +345,8 @@ namespace boost {
#endif // BOOST_SIGNALS_NUM_ARGS > 0
call_bound_slot f(&args);
- typedef typename call_bound_slot::result_type result_type;
- optional<result_type> cache;
+ typedef typename call_bound_slot::result_type call_result_type;
+ optional<call_result_type> cache;
// Let the combiner call the slots via a pair of input iterators
return combiner()(slot_call_iterator(notification.impl->slots_.begin(),
impl->slots_.end(), f, cache),
@@ -386,8 +386,8 @@ namespace boost {
call_bound_slot f(&args);
- typedef typename call_bound_slot::result_type result_type;
- optional<result_type> cache;
+ typedef typename call_bound_slot::result_type call_result_type;
+ optional<call_result_type> cache;
// Let the combiner call the slots via a pair of input iterators
return combiner()(slot_call_iterator(notification.impl->slots_.begin(),