Subject: [Boost-commit] svn:boost r66856 - in branches/release/boost/signals: . detail
From: marshall_at_[hidden]
Date: 2010-11-29 16:27:12
Author: marshall
Date: 2010-11-29 16:27:10 EST (Mon, 29 Nov 2010)
New Revision: 66856
URL: http://svn.boost.org/trac/boost/changeset/66856
Log:
Merge patch to release; fixes #4365
Text files modified:
branches/release/boost/signals/detail/named_slot_map.hpp | 12 ++++++------
branches/release/boost/signals/detail/slot_call_iterator.hpp | 4 ++--
branches/release/boost/signals/signal_template.hpp | 8 ++++----
3 files changed, 12 insertions(+), 12 deletions(-)
Modified: branches/release/boost/signals/detail/named_slot_map.hpp
==============================================================================
--- branches/release/boost/signals/detail/named_slot_map.hpp (original)
+++ branches/release/boost/signals/detail/named_slot_map.hpp 2010-11-29 16:27:10 EST (Mon, 29 Nov 2010)
@@ -32,10 +32,10 @@
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 @@
#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()
Modified: branches/release/boost/signals/detail/slot_call_iterator.hpp
==============================================================================
--- branches/release/boost/signals/detail/slot_call_iterator.hpp (original)
+++ branches/release/boost/signals/detail/slot_call_iterator.hpp 2010-11-29 16:27:10 EST (Mon, 29 Nov 2010)
@@ -47,9 +47,9 @@
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());
}
Modified: branches/release/boost/signals/signal_template.hpp
==============================================================================
--- branches/release/boost/signals/signal_template.hpp (original)
+++ branches/release/boost/signals/signal_template.hpp 2010-11-29 16:27:10 EST (Mon, 29 Nov 2010)
@@ -345,8 +345,8 @@
#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 @@
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(),