Subject: [Boost-commit] svn:boost r74236 - trunk/boost/unordered/detail
From: dnljms_at_[hidden]
Date: 2011-09-05 04:06:21
Author: danieljames
Date: 2011-09-05 04:06:17 EDT (Mon, 05 Sep 2011)
New Revision: 74236
URL: http://svn.boost.org/trac/boost/changeset/74236
Log:
Unordered: Try to fix vacpp's issue with `select_on_container_copy_construction`
Text files modified:
trunk/boost/unordered/detail/allocator_helpers.hpp | 9 +++++++--
1 files changed, 7 insertions(+), 2 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-05 04:06:17 EDT (Mon, 05 Sep 2011)
@@ -250,10 +250,15 @@
template <typename T>
struct has_select_on_container_copy_construction
{
- BOOST_UNORDERED_CHECK_MEMBER(1, 1,
+#if defined(__IBMCPP__)
+ BOOST_UNORDERED_CHECK_MEMBER(1, 2,
+ select_on_container_copy_construction,
+ T (T::*)());
+#endif
+ BOOST_UNORDERED_CHECK_MEMBER(2, 1,
select_on_container_copy_construction,
T (T::*)() const);
- BOOST_UNORDERED_DEFAULT_MEMBER(2, 2);
+ BOOST_UNORDERED_DEFAULT_MEMBER(3, 2);
enum { value = sizeof(test<T>(choose())) == sizeof(choice1::type) };
};