Unordered: Revert unmerged changes in trunk.

So that I can fix issues in the beta.


[SVN r78788]

include/boost/unordered/detail/equivalent.hpp

@@ -497,21 +497,12 @@ namespace boost { namespace unordered { namespace detail {
         }
 
 #if defined(BOOST_NO_RVALUE_REFERENCES)
-#   if defined(BOOST_NO_VARIADIC_TEMPLATES)
         iterator emplace(boost::unordered::detail::emplace_args1<
                 boost::unordered::detail::please_ignore_this_overload> const&)
         {
             BOOST_ASSERT(false);
             return iterator();
         }
-#   else
-        iterator emplace(
-                boost::unordered::detail::please_ignore_this_overload const&)
-        {
-            BOOST_ASSERT(false);
-            return iterator();
-        }
-#   endif
 #endif
 
         template <BOOST_UNORDERED_EMPLACE_TEMPLATE>