From 674d635024cf4af771770209f9119d087c0b94c8 Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Sat, 8 Oct 2011 17:39:36 +0000
Subject: [PATCH] Unordered: Move has_member into nested struct for sun.

[SVN r74812]
---
 .../boost/unordered/detail/allocator_helpers.hpp   | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/include/boost/unordered/detail/allocator_helpers.hpp b/include/boost/unordered/detail/allocator_helpers.hpp
index e3243cc1..95ce2963 100644
--- a/include/boost/unordered/detail/allocator_helpers.hpp
+++ b/include/boost/unordered/detail/allocator_helpers.hpp
@@ -163,19 +163,19 @@ namespace boost { namespace unordered { namespace detail {
     template <class U> static BOOST_PP_CAT(choice, result)::type            \
         test(BOOST_PP_CAT(choice, count))
 
-#define BOOST_UNORDERED_WRAP_PARAMATERS(z, n, data) congert_from_anything
-
 #define BOOST_UNORDERED_HAS_MEMBER(name)                                    \
     struct BOOST_PP_CAT(has_, name)                                         \
     {                                                                       \
-        struct base_mixin { int name; };                                    \
-        struct base : public T, public base_mixin {};                       \
+        struct impl {                                                       \
+            struct base_mixin { int name; };                                \
+            struct base : public T, public base_mixin {};                   \
                                                                             \
-        BOOST_UNORDERED_CHECK_MEMBER(1, 1, name, int base_mixin::*);        \
-        BOOST_UNORDERED_DEFAULT_MEMBER(2, 2);                               \
+            BOOST_UNORDERED_CHECK_MEMBER(1, 1, name, int base_mixin::*);    \
+            BOOST_UNORDERED_DEFAULT_MEMBER(2, 2);                           \
+        };                                                                  \
                                                                             \
         enum { value = sizeof(choice2::type) ==                             \
-            sizeof(test<base>(choose()))                                    \
+            sizeof(impl::test<impl::base>(choose()))                        \
         };                                                                  \
     }