Index: libs/signals/src/named_slot_map.cpp
===================================================================
RCS file: /cvsroot/boost/boost/libs/signals/src/named_slot_map.cpp,v
retrieving revision 1.12
diff -c -r1.12 named_slot_map.cpp
*** libs/signals/src/named_slot_map.cpp	8 Dec 2005 03:12:55 -0000	1.12
--- libs/signals/src/named_slot_map.cpp	30 Sep 2006 11:55:10 -0000
***************
*** 23,68 ****
  typedef slot_container_type::iterator group_iterator;
  typedef slot_container_type::const_iterator const_group_iterator;
  
- named_slot_map_iterator::named_slot_map_iterator() : slot_assigned(false) {}
- 
- named_slot_map_iterator::
- named_slot_map_iterator(const named_slot_map_iterator& other)
-   : group(other.group), last_group(other.last_group),
-     slot_assigned(other.slot_assigned)
- {
-   if (slot_assigned) slot_ = other.slot_;
- }
- 
- named_slot_map_iterator&
- named_slot_map_iterator::operator=(const named_slot_map_iterator& other)
- {
-   slot_assigned = other.slot_assigned;
-   group = other.group;
-   last_group = other.last_group;
-   if (slot_assigned) slot_ = other.slot_;
-   return *this;
- }
- 
- 
- connection_slot_pair& named_slot_map_iterator::dereference() const
- { return *slot_; }
- 
- void named_slot_map_iterator::increment()
- {
-   ++slot_;
-   if (slot_ == group->second.end()) {
-     ++group;
-     init_next_group();
-   }
- }
- 
- bool
- named_slot_map_iterator::equal(const named_slot_map_iterator& other) const
- {
-   return (group == other.group
-           && (group == last_group
-               || slot_ == other.slot_));
- }
  
  #if BOOST_WORKAROUND(_MSC_VER, <= 1400)
  void named_slot_map_iterator::decrement() { assert(false); }
--- 23,28 ----
Index: boost/signals/detail/named_slot_map.hpp
===================================================================
RCS file: /cvsroot/boost/boost/boost/signals/detail/named_slot_map.hpp,v
retrieving revision 1.12
diff -c -r1.12 named_slot_map.hpp
*** boost/signals/detail/named_slot_map.hpp	8 Dec 2005 03:12:53 -0000	1.12
--- boost/signals/detail/named_slot_map.hpp	30 Sep 2006 11:55:11 -0000
***************
*** 60,66 ****
    typedef const stored_group& first_argument_type;
    typedef const stored_group& second_argument_type;
  
!   group_bridge_compare(const Compare& c) : comp(c) {}
  
    bool operator()(const stored_group& k1, const stored_group& k2) const
    {
--- 60,67 ----
    typedef const stored_group& first_argument_type;
    typedef const stored_group& second_argument_type;
  
!   group_bridge_compare(const Compare& c) : comp(c) 
!   { }
  
    bool operator()(const stored_group& k1, const stored_group& k2) const
    {
***************
*** 92,104 ****
                            connection_slot_pair,
                            forward_traversal_tag> inherited;
  public:
!   named_slot_map_iterator();
!   named_slot_map_iterator(const named_slot_map_iterator&);
!   named_slot_map_iterator& operator=(const named_slot_map_iterator&);
! 
!   connection_slot_pair& dereference() const;
!   void increment();
!   bool equal(const named_slot_map_iterator& other) const;
  
  #if BOOST_WORKAROUND(_MSC_VER, <= 1400)
    void decrement();
--- 93,131 ----
                            connection_slot_pair,
                            forward_traversal_tag> inherited;
  public:
!   named_slot_map_iterator() : slot_assigned(false) 
!   { }
!   named_slot_map_iterator(const named_slot_map_iterator& other) 
!     : group(other.group), last_group(other.last_group),
!     slot_assigned(other.slot_assigned)
!   {
!     if (slot_assigned) slot_ = other.slot_;
!   }
!   named_slot_map_iterator& operator=(const named_slot_map_iterator& other) 
!   {
!     slot_assigned = other.slot_assigned;
!     group = other.group;
!     last_group = other.last_group;
!     if (slot_assigned) slot_ = other.slot_;
!     return *this;
!   }
!   connection_slot_pair& dereference() const 
!   {
!     return *slot_;
!   }
!   void increment() 
!   {
!     ++slot_;
!     if (slot_ == group->second.end()) {
!       ++group;
!       init_next_group();
!     }
!   }
!   bool equal(const named_slot_map_iterator& other) const {
!     return (group == other.group
! 	    && (group == last_group
! 		|| slot_ == other.slot_));
!   }
  
  #if BOOST_WORKAROUND(_MSC_VER, <= 1400)
    void decrement();