[Boost-commit] svn:boost r43820 - in branches/unordered/trunk/boost/functional: . hash

From: daniel_james_at_[hidden]
Date: 2008-03-24 10:05:09

Author: danieljames
Date: 2008-03-24 10:05:09 EDT (Mon, 24 Mar 2008)
New Revision: 43820
URL: http://svn.boost.org/trac/boost/changeset/43820

Log:
Include the extensions from <boost/functional/hash/hash.hpp> as some people include that directly.
Text files modified: 
   branches/unordered/trunk/boost/functional/hash.hpp      |     3 ---                                     
   branches/unordered/trunk/boost/functional/hash/hash.hpp |    13 +++++++++----                           
   2 files changed, 9 insertions(+), 7 deletions(-)

Modified: branches/unordered/trunk/boost/functional/hash.hpp
==============================================================================
--- branches/unordered/trunk/boost/functional/hash.hpp	(original)
+++ branches/unordered/trunk/boost/functional/hash.hpp	2008-03-24 10:05:09 EDT (Mon, 24 Mar 2008)
@@ -9,6 +9,3 @@
 
 #include <boost/functional/hash/hash.hpp>
 
-#if !defined(BOOST_HASH_NO_EXTENSIONS)
-#include <boost/functional/hash/extensions.hpp>
-#endif

Modified: branches/unordered/trunk/boost/functional/hash/hash.hpp
==============================================================================
--- branches/unordered/trunk/boost/functional/hash/hash.hpp	(original)
+++ branches/unordered/trunk/boost/functional/hash/hash.hpp	2008-03-24 10:05:09 EDT (Mon, 24 Mar 2008)
@@ -10,10 +10,6 @@
 #if !defined(BOOST_FUNCTIONAL_HASH_HASH_HPP)
 #define BOOST_FUNCTIONAL_HASH_HASH_HPP
 
-#if defined(_MSC_VER) && (_MSC_VER >= 1020)
-# pragma once
-#endif
-
 #include <boost/functional/hash_fwd.hpp>
 #include <functional>
 #include <boost/functional/detail/hash_float.hpp>
@@ -522,3 +518,12 @@
 }
 
 #endif // BOOST_FUNCTIONAL_HASH_HASH_HPP
+
+// Include this outside of the include guards in case the file is included
+// twice - once with BOOST_HASH_NO_EXTENSIONS defined, and then with it
+// undefined.
+
+#if !defined(BOOST_HASH_NO_EXTENSIONS) \
+    && !defined(BOOST_FUNCTIONAL_HASH_EXTENSIONS_HPP)
+#include <boost/functional/hash/extensions.hpp>
+#endif