Subject: [Boost-commit] svn:boost r57478 - in branches/release: boost/signals boost/signals/detail libs/signals libs/signals/src
From: hartmut.kaiser_at_[hidden]
Date: 2009-11-07 20:48:38
Author: hkaiser
Date: 2009-11-07 20:48:37 EST (Sat, 07 Nov 2009)
New Revision: 57478
URL: http://svn.boost.org/trac/boost/changeset/57478
Log:
Signals: merging fix for VS2010 from trunk
Properties modified:
branches/release/boost/signals/ (props changed)
branches/release/libs/signals/ (props changed)
Text files modified:
branches/release/boost/signals/detail/named_slot_map.hpp | 2 +-
branches/release/libs/signals/src/named_slot_map.cpp | 2 +-
2 files changed, 2 insertions(+), 2 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 2009-11-07 20:48:37 EST (Sat, 07 Nov 2009)
@@ -127,7 +127,7 @@
|| slot_ == other.slot_));
}
-#if BOOST_WORKAROUND(_MSC_VER, <= 1500)
+#if BOOST_WORKAROUND(_MSC_VER, <= 1600)
void decrement();
void advance(difference_type);
#endif
Modified: branches/release/libs/signals/src/named_slot_map.cpp
==============================================================================
--- branches/release/libs/signals/src/named_slot_map.cpp (original)
+++ branches/release/libs/signals/src/named_slot_map.cpp 2009-11-07 20:48:37 EST (Sat, 07 Nov 2009)
@@ -24,7 +24,7 @@
typedef slot_container_type::const_iterator const_group_iterator;
-#if BOOST_WORKAROUND(_MSC_VER, <= 1500)
+#if BOOST_WORKAROUND(_MSC_VER, <= 1600)
void named_slot_map_iterator::decrement() { assert(false); }
void named_slot_map_iterator::advance(difference_type) { assert(false); }
#endif