From 96fc0fa3c28851f7ba4e08fb2a1c250cdc5f6873 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Mon, 5 Sep 2011 08:06:17 +0000
Subject: [PATCH] Unordered: Try to fix vacpp's issue with
 `select_on_container_copy_construction`

[SVN r74236]
---
 include/boost/unordered/detail/allocator_helpers.hpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/include/boost/unordered/detail/allocator_helpers.hpp b/include/boost/unordered/detail/allocator_helpers.hpp
index 4cd6cfc8..2fc03a94 100644
--- a/include/boost/unordered/detail/allocator_helpers.hpp
+++ b/include/boost/unordered/detail/allocator_helpers.hpp
@@ -250,10 +250,15 @@ namespace boost { namespace unordered { namespace detail {
     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) };
     };