OSDN Git Service

* include/backward/hash_map: Don't #include "backward_warning.h"
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 13 Apr 2010 20:24:40 +0000 (20:24 +0000)
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>
Tue, 13 Apr 2010 20:24:40 +0000 (20:24 +0000)
if _GLIBCXX_PERMIT_BACKWARD_HASH is defined.
* include/backward/hash_set: Likewise.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158281 138bc75d-0d04-0410-961f-82ee72b054a4

libstdc++-v3/ChangeLog
libstdc++-v3/include/backward/hash_map
libstdc++-v3/include/backward/hash_set

index 63a106d..d34b55a 100644 (file)
@@ -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.
index 813ec47..fe6e785 100644 (file)
 #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>
index 5a2ade7..1e4f1a9 100644 (file)
 #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>