hash_map: Don't #include "backward_warning.h" if _GLIBCXX_PERMIT_BACKWARD_HASH is...

	* include/backward/hash_map: Don't #include "backward_warning.h"
	if _GLIBCXX_PERMIT_BACKWARD_HASH is defined.
	* include/backward/hash_set: Likewise.

From-SVN: r158281

diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 63a106d392d88eea7c53377979b741d4a77f01a4..d34b55a83627bcb00ba03db21c925a71085f0b2e 100644 (file)
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-13  Ian Lance Taylor  <iant@google.com>
+
+       * include/backward/hash_map: Don't #include "backward_warning.h"
+       if _GLIBCXX_PERMIT_BACKWARD_HASH is defined.
+       * include/backward/hash_set: Likewise.
+
 2010-04-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
 
        * configure.host (os_include_dir): Removed solaris2.7 support.

diff --git a/libstdc++-v3/include/backward/hash_map b/libstdc++-v3/include/backward/hash_map
index 813ec4728609e866c3dae5a797885b12812450b4..fe6e785c01242e5a7f616f175e4dde99b1a3a457 100644 (file)
--- a/libstdc++-v3/include/backward/hash_map
+++ b/libstdc++-v3/include/backward/hash_map
@@ -57,7 +57,10 @@
 #ifndef _BACKWARD_HASH_MAP
 #define _BACKWARD_HASH_MAP 1
 
+#ifndef _GLIBCXX_PERMIT_BACKWARD_HASH
 #include "backward_warning.h"
+#endif
+
 #include <bits/c++config.h>
 #include <backward/hashtable.h>
 #include <bits/concept_check.h>

diff --git a/libstdc++-v3/include/backward/hash_set b/libstdc++-v3/include/backward/hash_set
index 5a2ade782143ab9c5f24372240a3f273c91da2d9..1e4f1a9792d86f85f730ab00bba0c2e10bdb8b7a 100644 (file)
--- a/libstdc++-v3/include/backward/hash_set
+++ b/libstdc++-v3/include/backward/hash_set
@@ -57,7 +57,10 @@
 #ifndef _BACKWARD_HASH_SET
 #define _BACKWARD_HASH_SET 1
 
+#ifndef _GLIBCXX_PERMIT_BACKWARD_HASH
 #include "backward_warning.h"
+#endif
+
 #include <bits/c++config.h>
 #include <backward/hashtable.h>
 #include <bits/concept_check.h>