Unordered: Revert unmerged changes in trunk.

So that I can fix issues in the beta.


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

View File

@@ -14,6 +14,7 @@
#endif
#include <boost/unordered/unordered_set_fwd.hpp>
#include <boost/unordered/detail/allocator_helpers.hpp>
#include <boost/unordered/detail/equivalent.hpp>
#include <boost/unordered/detail/unique.hpp>
#include <boost/unordered/detail/util.hpp>
@@ -230,15 +231,15 @@ namespace unordered
// emplace
#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
#if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template <class... Args>
std::pair<iterator, bool> emplace(BOOST_FWD_REF(Args)... args)
std::pair<iterator, bool> emplace(Args&&... args)
{
return table_.emplace(boost::forward<Args>(args)...);
}
template <class... Args>
iterator emplace_hint(const_iterator, BOOST_FWD_REF(Args)... args)
iterator emplace_hint(const_iterator, Args&&... args)
{
return table_.emplace(boost::forward<Args>(args)...).first;
}
@@ -703,15 +704,15 @@ namespace unordered
// emplace
#if !defined(BOOST_NO_VARIADIC_TEMPLATES)
#if defined(BOOST_UNORDERED_VARIADIC_MOVE)
template <class... Args>
iterator emplace(BOOST_FWD_REF(Args)... args)
iterator emplace(Args&&... args)
{
return table_.emplace(boost::forward<Args>(args)...);
}
template <class... Args>
iterator emplace_hint(const_iterator, BOOST_FWD_REF(Args)... args)
iterator emplace_hint(const_iterator, Args&&... args)
{
return table_.emplace(boost::forward<Args>(args)...);
}