diff options
| author | John Criswell <criswell@uiuc.edu> | 2004-09-24 18:28:00 +0000 |
|---|---|---|
| committer | John Criswell <criswell@uiuc.edu> | 2004-09-24 18:28:00 +0000 |
| commit | 9f011866e90928b9b798692a9cf0180e8f327540 (patch) | |
| tree | 794846911b41f50518a8af55a4fdde8057bd3d80 /include | |
| parent | 0c96766c90733e9f263334b6b079d58ce2e33791 (diff) | |
| download | llvm-9f011866e90928b9b798692a9cf0180e8f327540.tar.gz llvm-9f011866e90928b9b798692a9cf0180e8f327540.tar.bz2 llvm-9f011866e90928b9b798692a9cf0180e8f327540.tar.xz | |
Modified hash_map and hash_set configuration so that they are not
regenerated on every run of configure.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@16509 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include')
| -rw-r--r-- | include/llvm/ADT/hash_map.in | 10 | ||||
| -rw-r--r-- | include/llvm/ADT/hash_set.in | 10 |
2 files changed, 14 insertions, 6 deletions
diff --git a/include/llvm/ADT/hash_map.in b/include/llvm/ADT/hash_map.in index 9f09ef2ba1..c21711bf23 100644 --- a/include/llvm/ADT/hash_map.in +++ b/include/llvm/ADT/hash_map.in @@ -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 diff --git a/include/llvm/ADT/hash_set.in b/include/llvm/ADT/hash_set.in index 6da8c7f6a3..aae9615ccf 100644 --- a/include/llvm/ADT/hash_set.in +++ b/include/llvm/ADT/hash_set.in @@ -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 |