boost/signals
2
0
Fork 0
mirror of https://github.com/boostorg/signals.git synced 2026-01-19 04:42:10 +00:00
Code Issues Projects Releases Wiki Activity

Add missing patch for MSVC to develop, was already

Browse Source 
merged to master.
This commit is contained in:
K. Noel Belcourt
2014-07-26 15:26:29 -06:00
parent 46d9f68d90
commit 1fc2e2d874
2 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
include/boost/signals/detail/named_slot_map.hpp
View File

@@ -59,7 +59,7 @@ public:
typedef const stored_group& first_argument_type;
typedef const stored_group& second_argument_type;
group_bridge_compare(const Compare& c) : comp(c)
group_bridge_compare(const Compare& c) : comp(c)
{ }
bool operator()(const stored_group& k1, const stored_group& k2) const
@@ -92,15 +92,15 @@ class BOOST_SIGNALS_DECL named_slot_map_iterator :
connection_slot_pair,
forward_traversal_tag> inherited;
public:
named_slot_map_iterator() : slot_assigned(false)
named_slot_map_iterator() : slot_assigned(false)
{ }
named_slot_map_iterator(const named_slot_map_iterator& other)
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)
named_slot_map_iterator& operator=(const named_slot_map_iterator& other)
{
slot_assigned = other.slot_assigned;
group = other.group;
@@ -108,11 +108,11 @@ public:
if (slot_assigned) slot_ = other.slot_;
return *this;
}
connection_slot_pair& dereference() const
connection_slot_pair& dereference() const
{
return *slot_;
}
void increment()
void increment()
{
++slot_;
if (slot_ == group->second.end()) {
@@ -126,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

2
src/named_slot_map.cpp
View File

@@ -24,7 +24,7 @@ typedef slot_container_type::iterator group_iterator;
typedef slot_container_type::const_iterator const_group_iterator;
#if BOOST_WORKAROUND(_MSC_VER, <= 1700)
#if BOOST_WORKAROUND(_MSC_VER, <= 1900)
void named_slot_map_iterator::decrement() { assert(false); }
void named_slot_map_iterator::advance(difference_type) { assert(false); }
#endif