*** empty log message ***

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

9 files changed, 23 insertions, 8 deletions

diff --git a/include/llvm/Analysis/DSGraphTraits.h b/include/llvm/Analysis/DSGraphTraits.h
index 0a25622d45..4397f621c1 100644
--- a/include/llvm/Analysis/DSGraphTraits.h
+++ b/include/llvm/Analysis/DSGraphTraits.h
@@ -9,10 +9,11 @@
 #ifndef LLVM_ANALYSIS_DATASTRUCTURE_GRAPH_H
 #define LLVM_ANALYSIS_DATASTRUCTURE_GRAPH_H
 
-#include "Support/GraphTraits.h"
 #include "llvm/Analysis/DataStructure.h"
+#include "Support/GraphTraits.h"
+#include "Support/iterator"
 
-class DSNodeIterator : public std::forward_iterator<DSNode, ptrdiff_t> {
+class DSNodeIterator : public forward_iterator<DSNode, ptrdiff_t> {
   friend class DSNode;
   DSNode * const Node;
   unsigned Link;
diff --git a/include/llvm/Analysis/DataStructure/DSGraphTraits.h b/include/llvm/Analysis/DataStructure/DSGraphTraits.h
index 0a25622d45..4397f621c1 100644
--- a/include/llvm/Analysis/DataStructure/DSGraphTraits.h
+++ b/include/llvm/Analysis/DataStructure/DSGraphTraits.h
@@ -9,10 +9,11 @@
 #ifndef LLVM_ANALYSIS_DATASTRUCTURE_GRAPH_H
 #define LLVM_ANALYSIS_DATASTRUCTURE_GRAPH_H
 
-#include "Support/GraphTraits.h"
 #include "llvm/Analysis/DataStructure.h"
+#include "Support/GraphTraits.h"
+#include "Support/iterator"
 
-class DSNodeIterator : public std::forward_iterator<DSNode, ptrdiff_t> {
+class DSNodeIterator : public forward_iterator<DSNode, ptrdiff_t> {
   friend class DSNode;
   DSNode * const Node;
   unsigned Link;
diff --git a/include/llvm/Analysis/DataStructureGraph.h b/include/llvm/Analysis/DataStructureGraph.h
index 0a25622d45..4397f621c1 100644
--- a/include/llvm/Analysis/DataStructureGraph.h
+++ b/include/llvm/Analysis/DataStructureGraph.h
@@ -9,10 +9,11 @@
 #ifndef LLVM_ANALYSIS_DATASTRUCTURE_GRAPH_H
 #define LLVM_ANALYSIS_DATASTRUCTURE_GRAPH_H
 
-#include "Support/GraphTraits.h"
 #include "llvm/Analysis/DataStructure.h"
+#include "Support/GraphTraits.h"
+#include "Support/iterator"
 
-class DSNodeIterator : public std::forward_iterator<DSNode, ptrdiff_t> {
+class DSNodeIterator : public forward_iterator<DSNode, ptrdiff_t> {
   friend class DSNode;
   DSNode * const Node;
   unsigned Link;
diff --git a/include/llvm/CodeGen/MachineInstrAnnot.h b/include/llvm/CodeGen/MachineInstrAnnot.h
index fa80c7297f..d5f1da2edf 100644
--- a/include/llvm/CodeGen/MachineInstrAnnot.h
+++ b/include/llvm/CodeGen/MachineInstrAnnot.h
@@ -93,4 +93,4 @@ public:
 };
 
 
-#endif MACHINE_INSTR_ANNOT_h
+#endif
diff --git a/include/llvm/Support/InstIterator.h b/include/llvm/Support/InstIterator.h
index eb64113b7f..4f8f2af6c5 100644
--- a/include/llvm/Support/InstIterator.h
+++ b/include/llvm/Support/InstIterator.h
@@ -33,6 +33,15 @@ public:
   typedef unsigned                        difference_type;
   typedef BIty                            pointer;
   typedef IIty                            reference;
+
+  // Copy constructor...
+  template<typename A, typename B, typename C, typename D>
+  InstIterator(const InstIterator<A,B,C,D> &II)
+    : BBs(II.BBs), BB(II.BB), BI(II.BI) {}
+
+  template<typename A, typename B, typename C, typename D>
+  InstIterator(InstIterator<A,B,C,D> &II)
+    : BBs(II.BBs), BB(II.BB), BI(II.BI) {}
   
   template<class M> InstIterator(M &m) 
     : BBs(m.getBasicBlockList()), BB(BBs.begin()) {    // begin ctor
diff --git a/lib/Target/SparcV9/MachineInstrAnnot.h b/lib/Target/SparcV9/MachineInstrAnnot.h
index fa80c7297f..d5f1da2edf 100644
--- a/lib/Target/SparcV9/MachineInstrAnnot.h
+++ b/lib/Target/SparcV9/MachineInstrAnnot.h
@@ -93,4 +93,4 @@ public:
 };
 
 
-#endif MACHINE_INSTR_ANNOT_h
+#endif
diff --git a/tools/as/as.cpp b/tools/as/as.cpp
index c66dd598b9..36f8456878 100644
--- a/tools/as/as.cpp
+++ b/tools/as/as.cpp
@@ -17,6 +17,7 @@
 #include <fstream>
 #include <memory>
 using std::cerr;
+using std::string;
 
 static cl::opt<string> 
 InputFilename(cl::Positional, cl::desc("<input .llvm file>"), cl::init("-"));
diff --git a/tools/llvm-as/as.cpp b/tools/llvm-as/as.cpp
index c66dd598b9..36f8456878 100644
--- a/tools/llvm-as/as.cpp
+++ b/tools/llvm-as/as.cpp
@@ -17,6 +17,7 @@
 #include <fstream>
 #include <memory>
 using std::cerr;
+using std::string;
 
 static cl::opt<string> 
 InputFilename(cl::Positional, cl::desc("<input .llvm file>"), cl::init("-"));
diff --git a/tools/llvm-as/llvm-as.cpp b/tools/llvm-as/llvm-as.cpp
index c66dd598b9..36f8456878 100644
--- a/tools/llvm-as/llvm-as.cpp
+++ b/tools/llvm-as/llvm-as.cpp
@@ -17,6 +17,7 @@
 #include <fstream>
 #include <memory>
 using std::cerr;
+using std::string;
 
 static cl::opt<string> 
 InputFilename(cl::Positional, cl::desc("<input .llvm file>"), cl::init("-"));