Merge hash and unordered from trunk.

- Replace uses of deprecated C++0x macros
 - Set length of primes inside template on Sun C++. Fixes #3854
 - Missing newline at end of file.



[SVN r59911]
This commit is contained in:
Daniel James
2010-02-25 19:05:01 +00:00
parent 2b212d7c49
commit 3fb7d15f5b
9 changed files with 31 additions and 26 deletions

View File

@@ -19,7 +19,7 @@
#include <boost/unordered/detail/equivalent.hpp>
#include <boost/unordered/detail/unique.hpp>
#if !defined(BOOST_HAS_RVALUE_REFS)
#if defined(BOOST_NO_RVALUE_REFERENCES)
#include <boost/unordered/detail/move.hpp>
#endif
@@ -159,7 +159,7 @@ namespace boost
~unordered_map() {}
#if defined(BOOST_HAS_RVALUE_REFS)
#if !defined(BOOST_NO_RVALUE_REFERENCES)
unordered_map(unordered_map&& other)
: table_(other.table_, boost::unordered_detail::move_tag())
{
@@ -699,7 +699,7 @@ namespace boost
~unordered_multimap() {}
#if defined(BOOST_HAS_RVALUE_REFS)
#if !defined(BOOST_NO_RVALUE_REFERENCES)
unordered_multimap(unordered_multimap&& other)
: table_(other.table_, boost::unordered_detail::move_tag())
{