Merge hash, opt-in to breaking change rather than opt-out.

[SVN r64031]
2010-07-15 01:12:23 +00:00
parent 6f13510580
commit 76e621bddd
3 changed files with 15 additions and 6 deletions
@@ -15,7 +15,10 @@
 #include <boost/functional/hash/detail/hash_float.hpp>
 #include <string>
 #include <boost/limits.hpp>
+
+#if defined(BOOST_HASH_NO_IMPLICIT_CASTS)
 #include <boost/static_assert.hpp>
+#endif

 #if defined(BOOST_NO_TEMPLATE_PARTIAL_SPECIALIZATION)
 #include <boost/type_traits/is_pointer.hpp>
@@ -30,7 +33,7 @@

 namespace boost
 {
-#if !defined(BOOST_HASH_ALLOW_IMPLICIT_CASTS)
+#if defined(BOOST_HASH_NO_IMPLICIT_CASTS)

    // If you get a static assertion here, it's because hash_value
    // isn't declared for your type.