[llvm-commits] CVS: llvm/include/llvm/ADT/hash_map.in hash_set.in

[John Criswell]

Changes in directory llvm/include/llvm/ADT:

hash_map.in updated: 1.2 -> 1.3
hash_set.in updated: 1.2 -> 1.3
---
Log message:

Modified hash_map and hash_set configuration so that they are not
regenerated on every run of configure.





---
Diffs of the changes:  (+14 -6)

Index: llvm/include/llvm/ADT/hash_map.in
diff -u llvm/include/llvm/ADT/hash_map.in:1.2 llvm/include/llvm/ADT/hash_map.in:1.3
--- llvm/include/llvm/ADT/hash_map.in:1.2	Wed Sep  1 17:55:34 2004
+++ llvm/include/llvm/ADT/hash_map.in	Fri Sep 24 13:28:00 2004
@@ -25,7 +25,11 @@
 //  3.1      __gnu_cxx   ext/hash_map
 //
 
-#if @HAVE_GNU_EXT_HASH_MAP@
+#undef HAVE_GNU_EXT_HASH_MAP
+#undef HAVE_STD_EXT_HASH_MAP
+#undef HAVE_GLOBAL_HASH_MAP
+
+#if HAVE_GNU_EXT_HASH_MAP
 // This is for GCC-3.1+ which puts hash in ext/hash_map
 # include <ext/hash_map>
 # ifndef HASH_NAMESPACE
@@ -33,7 +37,7 @@
 # endif
 
 // GCC 3.0.x puts hash_map in <ext/hash_map> and in the std namespace.
-#elif @HAVE_STD_EXT_HASH_MAP@
+#elif HAVE_STD_EXT_HASH_MAP
 # include <ext/hash_map>
 # ifndef HASH_NAMESPACE
 #  define HASH_NAMESPACE std
@@ -41,7 +45,7 @@
 
 // Older compilers such as GCC before version 3.0 do not keep
 // extensions in the `ext' directory, and ignore the `std' namespace.
-#elif @HAVE_GLOBAL_HASH_MAP@
+#elif HAVE_GLOBAL_HASH_MAP
 # include <hash_map>
 # ifndef HASH_NAMESPACE
 #  define HASH_NAMESPACE std


Index: llvm/include/llvm/ADT/hash_set.in
diff -u llvm/include/llvm/ADT/hash_set.in:1.2 llvm/include/llvm/ADT/hash_set.in:1.3
--- llvm/include/llvm/ADT/hash_set.in:1.2	Wed Sep  1 17:55:34 2004
+++ llvm/include/llvm/ADT/hash_set.in	Fri Sep 24 13:28:00 2004
@@ -26,16 +26,20 @@
 //  3.1      __gnu_cxx   ext/hash_set
 //
 
+#undef HAVE_GNU_EXT_HASH_SET
+#undef HAVE_STD_EXT_HASH_SET
+#undef HAVE_GLOBAL_HASH_SET
+
 // GCC versions 3.1 and later put hash_set in <ext/hash_set> and in
 // the __gnu_cxx namespace.
-#if @HAVE_GNU_EXT_HASH_SET@
+#if HAVE_GNU_EXT_HASH_SET
 # include <ext/hash_set>
 # ifndef HASH_NAMESPACE
 #  define HASH_NAMESPACE __gnu_cxx
 # endif
 
 // GCC 3.0.x puts hash_set in <ext/hash_set> and in the std namespace.
-#elif @HAVE_STD_EXT_HASH_SET@
+#elif HAVE_STD_EXT_HASH_SET
 # include <ext/hash_set>
 # ifndef HASH_NAMESPACE
 #  define HASH_NAMESPACE std
@@ -43,7 +47,7 @@
 
 // Older compilers such as GCC before version 3.0 do not keep
 // extensions in the `ext' directory, and ignore the `std' namespace.
-#elif @HAVE_GLOBAL_HASH_SET@
+#elif HAVE_GLOBAL_HASH_SET
 # include <hash_set>
 # ifndef HASH_NAMESPACE
 #  define HASH_NAMESPACE std