Subject: [Boost-commit] svn:boost r80978 - in branches/release: . boost boost/signals boost/signals/detail libs libs/signals libs/signals/src libs/signals/test
From: steven_at_[hidden]
Date: 2012-10-13 13:27:31
Author: steven_watanabe
Date: 2012-10-13 13:27:29 EDT (Sat, 13 Oct 2012)
New Revision: 80978
URL: http://svn.boost.org/trac/boost/changeset/80978
Log:
Merge signals bug fixes from the trunk.
Added:
branches/release/libs/signals/test/swap_test.cpp
- copied unchanged from r74521, /trunk/libs/signals/test/swap_test.cpp
Properties modified:
branches/release/ (props changed)
branches/release/boost/ (props changed)
branches/release/boost/signals/ (props changed)
branches/release/libs/ (props changed)
branches/release/libs/signals/ (props changed)
branches/release/libs/signals/src/named_slot_map.cpp (contents, props changed)
Text files modified:
branches/release/boost/signals/connection.hpp | 2 +-
branches/release/boost/signals/detail/named_slot_map.hpp | 2 +-
branches/release/libs/signals/src/named_slot_map.cpp | 2 +-
branches/release/libs/signals/test/Jamfile.v2 | 2 ++
4 files changed, 5 insertions(+), 3 deletions(-)
Modified: branches/release/boost/signals/connection.hpp
==============================================================================
--- branches/release/boost/signals/connection.hpp (original)
+++ branches/release/boost/signals/connection.hpp 2012-10-13 13:27:29 EDT (Sat, 13 Oct 2012)
@@ -132,7 +132,7 @@
connection release();
- inline void swap(scoped_connection&);
+ void swap(scoped_connection&);
scoped_connection& operator=(const connection&);
scoped_connection& operator=(const scoped_connection&);
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 2012-10-13 13:27:29 EDT (Sat, 13 Oct 2012)
@@ -127,7 +127,7 @@
|| slot_ == other.slot_));
}
-#if BOOST_WORKAROUND(_MSC_VER, <= 1600)
+#if BOOST_WORKAROUND(_MSC_VER, <= 1700)
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 2012-10-13 13:27:29 EDT (Sat, 13 Oct 2012)
@@ -24,7 +24,7 @@
typedef slot_container_type::const_iterator const_group_iterator;
-#if BOOST_WORKAROUND(_MSC_VER, <= 1600)
+#if BOOST_WORKAROUND(_MSC_VER, <= 1700)
void named_slot_map_iterator::decrement() { assert(false); }
void named_slot_map_iterator::advance(difference_type) { assert(false); }
#endif
Modified: branches/release/libs/signals/test/Jamfile.v2
==============================================================================
--- branches/release/libs/signals/test/Jamfile.v2 (original)
+++ branches/release/libs/signals/test/Jamfile.v2 2012-10-13 13:27:29 EDT (Sat, 13 Oct 2012)
@@ -33,6 +33,8 @@
[ run signal_test.cpp ]
[ run trackable_test.cpp ]
+
+ [ run swap_test.cpp ]
;
}