[Boost-commit] svn:boost r74812 - trunk/boost/unordered/detail

Subject: [Boost-commit] svn:boost r74812 - trunk/boost/unordered/detail
From: dnljms_at_[hidden]
Date: 2011-10-08 13:39:37

Author: danieljames
Date: 2011-10-08 13:39:36 EDT (Sat, 08 Oct 2011)
New Revision: 74812
URL: http://svn.boost.org/trac/boost/changeset/74812

Log:
Unordered: Move has_member into nested struct for sun.
Text files modified: 
   trunk/boost/unordered/detail/allocator_helpers.hpp |    14 +++++++-------                          
   1 files changed, 7 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-10-08 13:39:36 EDT (Sat, 08 Oct 2011)
@@ -163,19 +163,19 @@
     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()))                        \
         };                                                                  \
     }