From 91145b5b0db9d22fcb1c645626bbc38d3ac3cd56 Mon Sep 17 00:00:00 2001 From: Daniel James Date: Wed, 23 Jan 2008 23:39:59 +0000 Subject: [PATCH] Merged revisions 42882-42941 via svnmerge from https://svn.boost.org/svn/boost/branches/unordered/trunk ................ r42887 | danieljames | 2008-01-20 21:32:04 +0000 (Sun, 20 Jan 2008) | 10 lines Merged revisions 42590-42664,42667-42697,42699-42723,42725-42855,42857-42881 via svnmerge from https://svn.boost.org/svn/boost/trunk ........ r42881 | danieljames | 2008-01-20 17:37:21 +0000 (Sun, 20 Jan 2008) | 1 line Include to get std::bad_alloc. ........ ................ r42892 | danieljames | 2008-01-21 13:03:16 +0000 (Mon, 21 Jan 2008) | 1 line On some compilers the Rogue Wave/Apache stdcxx library doesn't have the normal std::distance, but instead has a variant that takes the result as the third parameter so it doesn't have to work out the type from the iterator. ................ r42893 | danieljames | 2008-01-21 13:07:58 +0000 (Mon, 21 Jan 2008) | 1 line Fix a typo in the last commit. ................ r42895 | danieljames | 2008-01-21 13:33:29 +0000 (Mon, 21 Jan 2008) | 1 line Remove tabs from the last checkin. ................ r42896 | danieljames | 2008-01-21 15:51:40 +0000 (Mon, 21 Jan 2008) | 1 line Use Boost config to tell when we have a std::distance function. Also, no need for a macro. ................ r42908 | danieljames | 2008-01-21 21:37:04 +0000 (Mon, 21 Jan 2008) | 1 line Use boost::long_long_type and boost::ulong_long_type. ................ r42921 | danieljames | 2008-01-23 11:43:35 +0000 (Wed, 23 Jan 2008) | 1 line Remove some tabs. ................ r42922 | danieljames | 2008-01-23 11:46:28 +0000 (Wed, 23 Jan 2008) | 2 lines Add missing include. Refs #1596 ................ r42923 | danieljames | 2008-01-23 11:52:47 +0000 (Wed, 23 Jan 2008) | 2 lines Always use void const* for the second parameter of allocate. Refs #1596. ................ r42936 | danieljames | 2008-01-23 22:22:16 +0000 (Wed, 23 Jan 2008) | 1 line Use Boost style library name in the documentation. ................ r42937 | danieljames | 2008-01-23 22:22:32 +0000 (Wed, 23 Jan 2008) | 1 line More tabs. ................ r42941 | danieljames | 2008-01-23 23:35:01 +0000 (Wed, 23 Jan 2008) | 1 line Fix all the allocators. ................ [SVN r42943] --- hash/test/hash_number_test.cpp | 4 ++-- include/boost/functional/hash/hash.hpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/hash/test/hash_number_test.cpp b/hash/test/hash_number_test.cpp index 89910a2..204f84b 100644 --- a/hash/test/hash_number_test.cpp +++ b/hash/test/hash_number_test.cpp @@ -150,8 +150,8 @@ int main() NUMERIC_TEST(unsigned long, ulong) #if defined(BOOST_HAS_LONG_LONG) - NUMERIC_TEST_NO_LIMITS(long long, hash_longlong) - NUMERIC_TEST_NO_LIMITS(unsigned long long, ulonglong) + NUMERIC_TEST_NO_LIMITS(boost::long_long_type, long_long) + NUMERIC_TEST_NO_LIMITS(boost::ulong_long_type, ulong_long) #endif NUMERIC_TEST(float, float) diff --git a/include/boost/functional/hash/hash.hpp b/include/boost/functional/hash/hash.hpp index 5515efd..b11862c 100644 --- a/include/boost/functional/hash/hash.hpp +++ b/include/boost/functional/hash/hash.hpp @@ -46,8 +46,8 @@ namespace boost #endif #if defined(BOOST_HAS_LONG_LONG) - std::size_t hash_value(long long); - std::size_t hash_value(unsigned long long); + std::size_t hash_value(boost::long_long_type); + std::size_t hash_value(boost::ulong_long_type); #endif #if !BOOST_WORKAROUND(__DMC__, <= 0x848) @@ -195,12 +195,12 @@ namespace boost #endif #if defined(BOOST_HAS_LONG_LONG) - inline std::size_t hash_value(long long v) + inline std::size_t hash_value(boost::long_long_type v) { return hash_detail::hash_value_signed(v); } - inline std::size_t hash_value(unsigned long long v) + inline std::size_t hash_value(boost::ulong_long_type v) { return hash_detail::hash_value_unsigned(v); }