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

Subject: [Boost-commit] svn:boost r78413 - trunk/boost/unordered/detail
From: dnljms_at_[hidden]
Date: 2012-05-10 17:37:48

Author: danieljames
Date: 2012-05-10 17:37:44 EDT (Thu, 10 May 2012)
New Revision: 78413
URL: http://svn.boost.org/trac/boost/changeset/78413

Log:
Unordered: Try to fix Sun compile error.

The Sun compile tests have started failing, I'm not sure what triggered this,
but it seems to be confused by the various uses of the identifier `node`, so
try renaming the class and see if that improves things.
Text files modified: 
   trunk/boost/unordered/detail/unique.hpp |    16 ++++++++--------                        
   1 files changed, 8 insertions(+), 8 deletions(-)

Modified: trunk/boost/unordered/detail/unique.hpp
==============================================================================
--- trunk/boost/unordered/detail/unique.hpp	(original)
+++ trunk/boost/unordered/detail/unique.hpp	2012-05-10 17:37:44 EDT (Thu, 10 May 2012)
@@ -18,27 +18,27 @@
 
 namespace boost { namespace unordered { namespace detail {
 
-    template <typename A, typename T> struct node;
+    template <typename A, typename T> struct unique_node;
     template <typename T> struct ptr_node;
     template <typename Types> struct table_impl;
 
     template <typename A, typename T>
-    struct node :
+    struct unique_node :
         boost::unordered::detail::node_base<
             typename ::boost::unordered::detail::rebind_wrap<
-                A, node<A, T> >::type::pointer
+                A, unique_node<A, T> >::type::pointer
         >,
         boost::unordered::detail::value_base<T>
     {
         typedef typename ::boost::unordered::detail::rebind_wrap<
-            A, node<A, T> >::type::pointer link_pointer;
+            A, unique_node<A, T> >::type::pointer link_pointer;
         typedef boost::unordered::detail::node_base<link_pointer> node_base;
 
         std::size_t hash_;
 
 #if BOOST_UNORDERED_DETAIL_FULL_CONSTRUCT
         template <BOOST_UNORDERED_EMPLACE_TEMPLATE>
-        node(BOOST_UNORDERED_EMPLACE_ARGS) :
+        unique_node(BOOST_UNORDERED_EMPLACE_ARGS) :
             node_base(),
             hash_(0)
         {
@@ -46,11 +46,11 @@
                 this->value_ptr(), BOOST_UNORDERED_EMPLACE_FORWARD);
         }
 
-        ~node() {
+        ~unique_node() {
             boost::unordered::detail::destroy(this->value_ptr());
         }
 #else
-        node() :
+        unique_node() :
             node_base(),
             hash_(0)
         {}
@@ -103,7 +103,7 @@
     template <typename A, typename T, typename NodePtr, typename BucketPtr>
     struct pick_node2
     {
-        typedef boost::unordered::detail::node<A, T> node;
+        typedef boost::unordered::detail::unique_node<A, T> node;
 
         typedef typename boost::unordered::detail::allocator_traits<
             typename boost::unordered::detail::rebind_wrap<A, node>::type