From f3072d2023f300c02e7ead54fd2408c1d5cd29fe Mon Sep 17 00:00:00 2001
From: Daniel James <daniel@calamity.org.uk>
Date: Thu, 25 Feb 2010 19:05:01 +0000
Subject: [PATCH] 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]
---
 doc/Jamfile.v2                         | 3 ---
 include/boost/functional/hash/hash.hpp | 6 +++---
 test/Jamfile.v2                        | 4 ++--
 test/container_no_fwd_test.cpp         | 2 +-
 test/hash_number_test.cpp              | 2 +-
 5 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/doc/Jamfile.v2 b/doc/Jamfile.v2
index 9b2d291..1aab1e9 100644
--- a/doc/Jamfile.v2
+++ b/doc/Jamfile.v2
@@ -5,10 +5,7 @@
 
 xml hash : hash.qbk ;
 boostbook standalone : hash :
-    <xsl:param>html.stylesheet=../../../../doc/html/boostbook.css
     <xsl:param>boost.root=../../../..
-    <xsl:param>boost.libraries=../../../libraries.htm
-    <xsl:param>navig.graphics=1
 
     <xsl:param>chunk.first.sections=1
     <xsl:param>chunk.section.depth=2
diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp
index 1f33b9e..e85ca5a 100644
--- a/include/boost/functional/hash/hash.hpp
+++ b/include/boost/functional/hash/hash.hpp
@@ -44,7 +44,7 @@ namespace boost
     std::size_t hash_value(wchar_t);
 #endif
     
-#if defined(BOOST_HAS_LONG_LONG)
+#if !defined(BOOST_NO_LONG_LONG)
     std::size_t hash_value(boost::long_long_type);
     std::size_t hash_value(boost::ulong_long_type);
 #endif
@@ -174,7 +174,7 @@ namespace boost
     }
 #endif
 
-#if defined(BOOST_HAS_LONG_LONG)
+#if !defined(BOOST_NO_LONG_LONG)
     inline std::size_t hash_value(boost::long_long_type v)
     {
         return hash_detail::hash_value_signed(v);
@@ -408,7 +408,7 @@ namespace boost
     BOOST_HASH_SPECIALIZE_REF(std::wstring)
 #endif
 
-#if defined(BOOST_HAS_LONG_LONG)
+#if !defined(BOOST_NO_LONG_LONG)
     BOOST_HASH_SPECIALIZE(boost::long_long_type)
     BOOST_HASH_SPECIALIZE(boost::ulong_long_type)
 #endif
diff --git a/test/Jamfile.v2 b/test/Jamfile.v2
index 4435dd2..13a29a9 100644
--- a/test/Jamfile.v2
+++ b/test/Jamfile.v2
@@ -13,8 +13,8 @@ project hash-tests
         <toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
         <toolset>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
         <toolset>msvc:<warnings-as-errors>on
-        #<toolset>gcc:<warnings-as-errors>on
-        #<toolset>darwin:<warnings-as-errors>on
+        <toolset>gcc:<warnings-as-errors>on
+        <toolset>darwin:<warnings-as-errors>on
     ;
 
 test-suite functional/hash
diff --git a/test/container_no_fwd_test.cpp b/test/container_no_fwd_test.cpp
index cc6f6fa..9da09da 100644
--- a/test/container_no_fwd_test.cpp
+++ b/test/container_no_fwd_test.cpp
@@ -11,4 +11,4 @@ int main()
 {
     std::set<int> x;
     std::vector<std::string> y;
-}
\ No newline at end of file
+}
diff --git a/test/hash_number_test.cpp b/test/hash_number_test.cpp
index b1a52b3..91b9b92 100644
--- a/test/hash_number_test.cpp
+++ b/test/hash_number_test.cpp
@@ -152,7 +152,7 @@ int main()
     NUMERIC_TEST(long, hash_long)
     NUMERIC_TEST(unsigned long, ulong)
 
-#if defined(BOOST_HAS_LONG_LONG)
+#if !defined(BOOST_NO_LONG_LONG)
     NUMERIC_TEST_NO_LIMITS(boost::long_long_type, long_long)
     NUMERIC_TEST_NO_LIMITS(boost::ulong_long_type, ulong_long)
 #endif