Unordered: Revert unmerged changes in trunk.

So that I can fix issues in the beta.


[SVN r78788]
This commit is contained in:
Daniel James committed 2012-06-01 11:03:22 +00:00
1 parent 1eac47a275
commit 7158700502
16 files changed
+589 -563

No files matched your search

@@ -56,7 +56,7 @@ namespace detail {
return no_key();
}
#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
#if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template <class... Args>
static no_key extract(Args const&...)
{
@@ -111,7 +111,7 @@ namespace detail {
return v.first;
}
#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
#if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template <class Arg1, class... Args>
static key_type const& extract(key_type const& k,
Arg1 const&, Args const&...)
@@ -150,12 +150,12 @@ namespace detail {
}
#endif
#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
#if defined(BOOST_UNORDERED_VARIADIC_MOVE)
#define BOOST_UNORDERED_KEY_FROM_TUPLE(namespace_) \
template <typename T2> \
static no_key extract(boost::unordered::piecewise_construct_t, \
namespace_::tuple<> const&, BOOST_FWD_REF(T2)) \
namespace_::tuple<> const&, T2&&) \
{ \
return no_key(); \
} \
@@ -163,7 +163,7 @@ namespace detail {
template <typename T, typename T2> \
static typename is_key<key_type, T>::type \
extract(boost::unordered::piecewise_construct_t, \
namespace_::tuple<T> const& k, BOOST_FWD_REF(T2)) \
namespace_::tuple<T> const& k, T2&&) \
{ \
return typename is_key<key_type, T>::type( \
namespace_::get<0>(k)); \