Subject: [Boost-commit] svn:boost r74294 - trunk/boost/unordered/detail
From: dnljms_at_[hidden]
Date: 2011-09-07 06:01:26
Author: danieljames
Date: 2011-09-07 06:01:25 EDT (Wed, 07 Sep 2011)
New Revision: 74294
URL: http://svn.boost.org/trac/boost/changeset/74294
Log:
Unordered: Revert [74236].
On vacpp `has_select_on_container_copy_construction` was incorrectly returning
positive for a non-const `select_on_container_copy_construction`. This resulted
in a compile error as it tried to call it for a const allocator. The workaround
seemed to have just made things worse so I'm reverting it. It's actually not
that bad a problem as a non-const `select_on_container_copy_construction` is
probably a mistake.
Text files modified:
trunk/boost/unordered/detail/allocator_helpers.hpp | 9 ++-------
1 files changed, 2 insertions(+), 7 deletions(-)
Modified: trunk/boost/unordered/detail/allocator_helpers.hpp
==============================================================================
--- trunk/boost/unordered/detail/allocator_helpers.hpp (original)
+++ trunk/boost/unordered/detail/allocator_helpers.hpp 2011-09-07 06:01:25 EDT (Wed, 07 Sep 2011)
@@ -250,15 +250,10 @@
template <typename T>
struct has_select_on_container_copy_construction
{
-#if defined(__IBMCPP__)
- BOOST_UNORDERED_CHECK_MEMBER(1, 2,
- select_on_container_copy_construction,
- T (T::*)());
-#endif
- BOOST_UNORDERED_CHECK_MEMBER(2, 1,
+ BOOST_UNORDERED_CHECK_MEMBER(1, 1,
select_on_container_copy_construction,
T (T::*)() const);
- BOOST_UNORDERED_DEFAULT_MEMBER(3, 2);
+ BOOST_UNORDERED_DEFAULT_MEMBER(2, 2);
enum { value = sizeof(test<T>(choose())) == sizeof(choice1::type) };
};