GCC 3.1 changes

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3076 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/include/Support/PostOrderIterator.h b/include/Support/PostOrderIterator.h
index 4f94141b5c4406d21f7400a6f5c560b67d036f2d..a9f13da03deb313c2eb1d328703f325a8880d559 100644 (file)
--- 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 2214b918613ed129d2e9a8e48a6bd6ffd9fc3e0a..02279eb08fc51630e89fb045a3164d6e005ef533 100644 (file)
--- 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 4f94141b5c4406d21f7400a6f5c560b67d036f2d..a9f13da03deb313c2eb1d328703f325a8880d559 100644 (file)
--- 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));