diff -aur boost.orig/unordered/detail/emplace_args.hpp boost/unordered/detail/emplace_args.hpp
--- boost.orig/unordered/detail/emplace_args.hpp	2012-01-15 20:22:15.000000000 +0000
+++ boost/unordered/detail/emplace_args.hpp	2012-04-12 17:18:18.153181000 +0100
@@ -160,7 +160,7 @@
     //
     // Used for piecewise construction.
 
-#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x590)
+#if !BOOST_WORKAROUND(__SUNPRO_CC, <= 0x5120)
 
 #define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE(n, namespace_)                 \
     template<typename T>                                                    \
@@ -207,7 +207,7 @@
         new ((void*) ptr) T();
     }
 
-#define BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL(z, n, _)                  \
+#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_impl(                                         \
             boost::unordered::detail::length<n>, T* ptr,                    \
@@ -218,11 +218,11 @@
         );                                                                  \
     }
 
-#define BOOST_UNORDERED_GET_TUPLE_ARG(z, n, _)                              \
+#define BOOST_UNORDERED_GET_TUPLE_ARG(z, n, namespace_)                     \
     boost::get<n>(x)
 
     BOOST_PP_REPEAT_FROM_TO(1, 10,                                          \
-        BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL, _)
+        BOOST_UNORDERED_CONSTRUCT_FROM_TUPLE_IMPL, boost)
 
     template <typename T, typename Tuple>
     void construct_from_tuple(T* ptr, Tuple const& x)