From edefd157a7816c798f1be4b46b3af81b6c9cf61c Mon Sep 17 00:00:00 2001
From: Chris Lattner <sabre@nondot.org>
Date: Wed, 31 Jul 2002 19:31:59 +0000
Subject: [PATCH] Changes to be GCC 3.1 friendly

llvm-svn: 3184
---
 llvm/include/llvm/Analysis/DataStructure.h | 2 +-
 llvm/include/llvm/Analysis/InstForest.h    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/llvm/include/llvm/Analysis/DataStructure.h b/llvm/include/llvm/Analysis/DataStructure.h
index 61a2d67808bf..c080c97e593b 100644
--- a/llvm/include/llvm/Analysis/DataStructure.h
+++ b/llvm/include/llvm/Analysis/DataStructure.h
@@ -10,8 +10,8 @@
 #include "llvm/Pass.h"
 #include "llvm/GlobalValue.h"
 #include "Support/HashExtras.h"
+#include "Support/hash_set"
 #include <set>
-#include <hash_set>
 #include <string>
 
 class Type;
diff --git a/llvm/include/llvm/Analysis/InstForest.h b/llvm/include/llvm/Analysis/InstForest.h
index 5d27c8191591..243b0fdd0545 100644
--- a/llvm/include/llvm/Analysis/InstForest.h
+++ b/llvm/include/llvm/Analysis/InstForest.h
@@ -142,7 +142,7 @@ template<class Payload>
 class InstForest : public std::vector<InstTreeNode<Payload> *> {
   friend class InstTreeNode<Payload>;
 
-  typedef std::vector<InstTreeNode<Payload> *>::const_iterator const_iterator;
+  typedef typename std::vector<InstTreeNode<Payload> *>::const_iterator const_iterator;
 
   // InstMap - Map contains entries for ALL instructions in the method and the
   // InstTreeNode that they correspond to.