Index: emplace_args.hpp
===================================================================
--- emplace_args.hpp	(revision 150)
+++ emplace_args.hpp	(working copy)
@@ -164,7 +164,7 @@
 
 #   define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(n, namespace_)              \
     template<typename T>                                                    \
-    void construct_from_tuple(T* ptr, namespace_::tuple<>)                  \
+    void construct_from_tuple(T* ptr, namespace_ tuple<>)                   \
     {                                                                       \
         new ((void*) ptr) T();                                              \
     }                                                                       \
@@ -175,7 +175,7 @@
 #   define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL(z, n, namespace_)      \
     template<typename T, BOOST_PP_ENUM_PARAMS_Z(z, n, typename A)>          \
     void construct_from_tuple(T* ptr,                                       \
-            namespace_::tuple<BOOST_PP_ENUM_PARAMS_Z(z, n, A)> const& x)    \
+            namespace_ tuple<BOOST_PP_ENUM_PARAMS_Z(z, n, A)> const& x)     \
     {                                                                       \
         new ((void*) ptr) T(                                                \
             BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_GET_TUPLE_ARG, namespace_) \
@@ -183,7 +183,7 @@
     }
 
 #   define BOOST_UNORDERED_GET_TUPLE_ARG(z, n, namespace_)                  \
-    namespace_::get<n>(x)
+    namespace_ get<n>(x)
 
 #else
 
@@ -193,7 +193,7 @@
     template<typename T>                                                    \
     void construct_from_tuple_impl(                                         \
             boost::unordered::detail::length<0>, T* ptr,                    \
-            namespace_::tuple<>)                                            \
+            namespace_ tuple<>)                                             \
     {                                                                       \
         new ((void*) ptr) T();                                              \
     }                                                                       \
@@ -205,7 +205,7 @@
     template<typename T, BOOST_PP_ENUM_PARAMS_Z(z, n, typename A)>          \
     void construct_from_tuple_impl(                                         \
             boost::unordered::detail::length<n>, T* ptr,                    \
-            namespace_::tuple<BOOST_PP_ENUM_PARAMS_Z(z, n, A)> const& x)    \
+            namespace_ tuple<BOOST_PP_ENUM_PARAMS_Z(z, n, A)> const& x)     \
     {                                                                       \
         new ((void*) ptr) T(                                                \
             BOOST_PP_ENUM_##z(n, BOOST_UNORDERED_GET_TUPLE_ARG, namespace_) \
@@ -213,14 +213,14 @@
     }
 
 #   define BOOST_UNORDERED_GET_TUPLE_ARG(z, n, namespace_)                  \
-    namespace_::get<n>(x)
+    namespace_ get<n>(x)
 
 #endif
 
-BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, boost)
+BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, boost::)
 
 #if !defined(__SUNPRO_CC) && !defined(BOOST_NO_0X_HDR_TUPLE)
-   BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std)
+   BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(10, std::)
 #endif
 
 #undef BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE