From de32fedb8c6ec95258dd9e3c104f0e7e49f283cd Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Thu, 25 Jul 2002 15:00:43 +0000
Subject: [PATCH] GCC 3.1 changes

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@3076 91177308-0d34-0410-b5e6-96231b3b80d8
---
 include/Support/PostOrderIterator.h  | 2 +-
 include/Support/hash_set             | 7 +++++++
 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 4f94141b5c4..a9f13da03de 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 2214b918613..02279eb08fc 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 4f94141b5c4..a9f13da03de 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));