feedc0de/boost_container_hash
1
0
Fork 0
forked from boostorg/container_hash
Code Pull Requests Activity

Merge hash and unordered from trunk.

Browse Source 
- 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 fdc0995489
commit f3072d2023
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
doc/Jamfile.v2
View File

@@ -5,10 +5,7 @@
xml hash : hash.qbk ; xml hash : hash.qbk ;
boostbook standalone : hash : boostbook standalone : hash :
<xsl:param>html.stylesheet=../../../../doc/html/boostbook.css
<xsl:param>boost.root=../../../.. <xsl:param>boost.root=../../../..
<xsl:param>boost.libraries=../../../libraries.htm
<xsl:param>navig.graphics=1
<xsl:param>chunk.first.sections=1 <xsl:param>chunk.first.sections=1
<xsl:param>chunk.section.depth=2 <xsl:param>chunk.section.depth=2

6
include/boost/functional/hash/hash.hpp
View File

@@ -44,7 +44,7 @@ namespace boost
std::size_t hash_value(wchar_t); std::size_t hash_value(wchar_t);
#endif #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::long_long_type);
std::size_t hash_value(boost::ulong_long_type); std::size_t hash_value(boost::ulong_long_type);
#endif #endif
@@ -174,7 +174,7 @@ namespace boost
} }
#endif #endif
#if defined(BOOST_HAS_LONG_LONG) #if !defined(BOOST_NO_LONG_LONG)
inline std::size_t hash_value(boost::long_long_type v) inline std::size_t hash_value(boost::long_long_type v)
{ {
return hash_detail::hash_value_signed(v); return hash_detail::hash_value_signed(v);
@@ -408,7 +408,7 @@ namespace boost
BOOST_HASH_SPECIALIZE_REF(std::wstring) BOOST_HASH_SPECIALIZE_REF(std::wstring)
#endif #endif
#if defined(BOOST_HAS_LONG_LONG) #if !defined(BOOST_NO_LONG_LONG)
BOOST_HASH_SPECIALIZE(boost::long_long_type) BOOST_HASH_SPECIALIZE(boost::long_long_type)
BOOST_HASH_SPECIALIZE(boost::ulong_long_type) BOOST_HASH_SPECIALIZE(boost::ulong_long_type)
#endif #endif

4
test/Jamfile.v2
View File

@@ -13,8 +13,8 @@ project hash-tests
<toolset>gcc:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter" <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>darwin:<cxxflags>"-pedantic -Wstrict-aliasing -fstrict-aliasing -Wextra -Wsign-promo -Wunused-parameter"
<toolset>msvc:<warnings-as-errors>on <toolset>msvc:<warnings-as-errors>on
#<toolset>gcc:<warnings-as-errors>on <toolset>gcc:<warnings-as-errors>on
#<toolset>darwin:<warnings-as-errors>on <toolset>darwin:<warnings-as-errors>on
; ;
test-suite functional/hash test-suite functional/hash

2
test/container_no_fwd_test.cpp
View File

@@ -11,4 +11,4 @@ int main()
{ {
std::set<int> x; std::set<int> x;
std::vector<std::string> y; std::vector<std::string> y;
} }

2
test/hash_number_test.cpp
View File

@@ -152,7 +152,7 @@ int main()
NUMERIC_TEST(long, hash_long) NUMERIC_TEST(long, hash_long)
NUMERIC_TEST(unsigned long, ulong) 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::long_long_type, long_long)
NUMERIC_TEST_NO_LIMITS(boost::ulong_long_type, ulong_long) NUMERIC_TEST_NO_LIMITS(boost::ulong_long_type, ulong_long)
#endif #endif