diff options
| author | Vikram S. Adve <vadve@cs.uiuc.edu> | 2003-07-25 14:06:13 +0000 |
|---|---|---|
| committer | Vikram S. Adve <vadve@cs.uiuc.edu> | 2003-07-25 14:06:13 +0000 |
| commit | 7f90b520b48d4bafe2f481c60f55fa8499969998 (patch) | |
| tree | d14b99fb8af3b61d5e04a4ec531fce9dded6e1f0 /include/Support | |
| parent | a259c9be2acc9528ec7feb3cfd51dcde36d87bb3 (diff) | |
| download | external_llvm-7f90b520b48d4bafe2f481c60f55fa8499969998.zip external_llvm-7f90b520b48d4bafe2f481c60f55fa8499969998.tar.gz external_llvm-7f90b520b48d4bafe2f481c60f55fa8499969998.tar.bz2 | |
Include vector into these two files to ensure that specializations like
stl_bvector.h are correctly included into *anything* that includes hash_map
or hash_set. ext/hash_map includes stl_vector.h directly and leaves
out the specializations, causing truly nasty bugs due to inconsistent
versions of vector<> being used for vector<bool> in different files.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@7303 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'include/Support')
| -rw-r--r-- | include/Support/hash_map | 4 | ||||
| -rw-r--r-- | include/Support/hash_set | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/include/Support/hash_map b/include/Support/hash_map index ce4c42f..72d8bf3 100644 --- a/include/Support/hash_map +++ b/include/Support/hash_map @@ -42,6 +42,10 @@ using HASH_NAMESPACE::hash_map; using HASH_NAMESPACE::hash_multimap; using HASH_NAMESPACE::hash; +/* Include vector because ext/hash_map includes stl_vector.h and leaves + out specializations like stl_bvector.h, causing link conflicts. */ +#include <vector> + #include <Support/HashExtras.h> #endif diff --git a/include/Support/hash_set b/include/Support/hash_set index 045083c..46e75d8 100644 --- a/include/Support/hash_set +++ b/include/Support/hash_set @@ -41,6 +41,10 @@ using HASH_NAMESPACE::hash_set; using HASH_NAMESPACE::hash; +/* Include vector because ext/hash_set includes stl_vector.h and leaves + out specializations like stl_bvector.h, causing link conflicts. */ +#include <vector> + #include <Support/HashExtras.h> #endif |