Merge Hash. Fixes #8568, Refs #8822.#8822.#8822.

[SVN r85389]
This commit is contained in:
Daniel James committed 2013-08-18 09:48:53 +00:00
1 parent b271abdda3
commit e75e6d7eda
2 files changed
+24 -18

No files matched your search

+11
View File
@@ -27,6 +27,13 @@
#include <typeindex>
#endif
#if defined(BOOST_MSVC)
#pragma warning(push)
#pragma warning(disable:6295) // Ill-defined for-loop : 'unsigned int' values
// are always of range '0' to '4294967295'.
// Loop executes infinitely.
#endif
#if BOOST_WORKAROUND(__GNUC__, < 3) \
&& !defined(__SGI_STL_PORT) && !defined(_STLPORT_VERSION)
#define BOOST_HASH_CHAR_TRAITS string_char_traits
@@ -518,6 +525,10 @@ namespace boost
#undef BOOST_HASH_CHAR_TRAITS
#if defined(BOOST_MSVC)
#pragma warning(pop)
#endif
#endif // BOOST_FUNCTIONAL_HASH_HASH_HPP
// Include this outside of the include guards in case the file is included