Update of /cvsroot/boost-sandbox/boost-sandbox/boost/thread_safe_signals/detail
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv13043/boost/thread_safe_signals/detail
Modified Files:
signal_template.hpp slot_groups.hpp
Log Message:
Added missing typename to fix compile under gcc 4.1.2
Index: signal_template.hpp
===================================================================
RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/thread_safe_signals/detail/signal_template.hpp,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- signal_template.hpp 28 Feb 2007 15:54:22 -0000 1.36
+++ signal_template.hpp 28 Feb 2007 17:08:48 -0000 1.37
@@ -290,7 +290,7 @@
// clean up disconnected connections
void nolock_cleanup_connections(bool grab_tracked,
- const connection_list_type::iterator &begin, const connection_list_type::iterator &end) const
+ const typename connection_list_type::iterator &begin, const typename connection_list_type::iterator &end) const
{
assert(_shared_state.unique());
typename connection_list_type::iterator it;
@@ -323,7 +323,7 @@
// clean up a few connections in constant time
void nolock_cleanup_connections(bool grab_tracked) const
{
- connection_list_type::iterator begin;
+ typename connection_list_type::iterator begin;
if(_garbage_collector_it == _shared_state->connection_bodies.end())
{
begin = _shared_state->connection_bodies.begin();
@@ -331,7 +331,7 @@
{
begin = _garbage_collector_it;
}
- connection_list_type::iterator end = begin;
+ typename connection_list_type::iterator end = begin;
++end;
if(end != _shared_state->connection_bodies.end()) ++end;
nolock_cleanup_connections(grab_tracked, begin, end);
@@ -382,7 +382,7 @@
}
shared_ptr<invocation_state> _shared_state;
- mutable connection_list_type::iterator _garbage_collector_it;
+ mutable typename connection_list_type::iterator _garbage_collector_it;
// connection list mutex must never be locked when attempting a blocking lock on a slot,
// or you could deadlock.
mutable mutex_type _mutex;
@@ -398,7 +398,7 @@
{
public:
typedef signalslib::detail::BOOST_WEAK_SIGNAL_CLASS_NAME<BOOST_SIGNAL_TEMPLATE_INSTANTIATION> weak_signal_type;
- friend class weak_signal_type;
+ friend class signalslib::detail::BOOST_WEAK_SIGNAL_CLASS_NAME<BOOST_SIGNAL_TEMPLATE_INSTANTIATION>;
typedef SlotFunction slot_function_type;
// typedef slotN<Signature, SlotFunction> slot_type;
@@ -409,7 +409,7 @@
typedef typename combiner_type::result_type result_type;
typedef Group group_type;
typedef GroupCompare group_compare_type;
- typedef signalslib::detail::BOOST_SIGNAL_IMPL_CLASS_NAME<BOOST_SIGNAL_TEMPLATE_INSTANTIATION>::slot_call_iterator
+ typedef typename signalslib::detail::BOOST_SIGNAL_IMPL_CLASS_NAME<BOOST_SIGNAL_TEMPLATE_INSTANTIATION>::slot_call_iterator
slot_call_iterator;
// typedef Tn argn_type;
#define BOOST_SIGNAL_MISC_STATEMENT(z, n, data) \
@@ -499,7 +499,7 @@
public:
typedef SlotFunction slot_function_type;
typedef typename slot_function_type::result_type slot_result_type;
- typedef BOOST_SIGNAL_CLASS_NAME<BOOST_SIGNAL_TEMPLATE_INSTANTIATION>::result_type
+ typedef typename BOOST_SIGNAL_CLASS_NAME<BOOST_SIGNAL_TEMPLATE_INSTANTIATION>::result_type
result_type;
BOOST_WEAK_SIGNAL_CLASS_NAME(const BOOST_SIGNAL_CLASS_NAME<BOOST_SIGNAL_TEMPLATE_INSTANTIATION>
Index: slot_groups.hpp
===================================================================
RCS file: /cvsroot/boost-sandbox/boost-sandbox/boost/thread_safe_signals/detail/slot_groups.hpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- slot_groups.hpp 16 Feb 2007 02:05:12 -0000 1.12
+++ slot_groups.hpp 28 Feb 2007 17:08:48 -0000 1.13
@@ -141,7 +141,7 @@
if(next != _list.end() && next != upper_bound(key))
{
// also erases old entry
- _group_map.insert(map_it, map_type::value_type(key, next));
+ _group_map.insert(map_it, typename map_type::value_type(key, next));
}else
{
_group_map.erase(map_it);
@@ -173,7 +173,7 @@
if(lower_bound_it == _group_map.end() ||
weakly_equivalent(lower_bound_it->first, key) == false)
{
- _group_map.insert(map_type::value_type(key, new_it));
+ _group_map.insert(typename map_type::value_type(key, new_it));
}
}
iterator get_list_iterator(const map_iterator &map_it)
|
