diff options
| -rw-r--r-- | include/Support/PostOrderIterator.h | 2 | ||||
| -rw-r--r-- | include/Support/hash_set | 7 | ||||
| -rw-r--r-- | include/llvm/ADT/PostOrderIterator.h | 2 |
3 files changed, 9 insertions, 2 deletions
diff --git a/include/Support/PostOrderIterator.h b/include/Support/PostOrderIterator.h index 4f94141b5c..a9f13da03d 100644 --- a/include/Support/PostOrderIterator.h +++ b/include/Support/PostOrderIterator.h @@ -131,7 +131,7 @@ class ReversePostOrderTraversal { copy(po_begin(BB), po_end(BB), back_inserter(Blocks)); } public: - typedef std::vector<NodeType*>::reverse_iterator rpo_iterator; + typedef typename std::vector<NodeType*>::reverse_iterator rpo_iterator; inline ReversePostOrderTraversal(GraphT G) { Initialize(GT::getEntryNode(G)); diff --git a/include/Support/hash_set b/include/Support/hash_set index 2214b91861..02279eb08f 100644 --- a/include/Support/hash_set +++ b/include/Support/hash_set @@ -9,13 +9,20 @@ #ifndef SUPPORT_HASHSET_H #define SUPPORT_HASHSET_H + #if __GNUC__==3 #include <ext/hash_set> +#ifndef HASH_NAMESPACE #define HASH_NAMESPACE __gnu_cxx +#endif + #else + #include <hash_set> +#ifndef HASH_NAMESPACE #define HASH_NAMESPACE std #endif +#endif using HASH_NAMESPACE::hash_set; using HASH_NAMESPACE::hash; diff --git a/include/llvm/ADT/PostOrderIterator.h b/include/llvm/ADT/PostOrderIterator.h index 4f94141b5c..a9f13da03d 100644 --- a/include/llvm/ADT/PostOrderIterator.h +++ b/include/llvm/ADT/PostOrderIterator.h @@ -131,7 +131,7 @@ class ReversePostOrderTraversal { copy(po_begin(BB), po_end(BB), back_inserter(Blocks)); } public: - typedef std::vector<NodeType*>::reverse_iterator rpo_iterator; + typedef typename std::vector<NodeType*>::reverse_iterator rpo_iterator; inline ReversePostOrderTraversal(GraphT G) { Initialize(GT::getEntryNode(G)); |