diff options
| -rw-r--r-- | llvm/include/llvm/Analysis/DSGraphTraits.h | 5 | ||||
| -rw-r--r-- | llvm/include/llvm/Analysis/DataStructureGraph.h | 5 | ||||
| -rw-r--r-- | llvm/include/llvm/CodeGen/MachineInstrAnnot.h | 2 | ||||
| -rw-r--r-- | llvm/include/llvm/Support/InstIterator.h | 9 | ||||
| -rw-r--r-- | llvm/tools/as/as.cpp | 1 | ||||
| -rw-r--r-- | llvm/tools/llvm-as/as.cpp | 1 | ||||
| -rw-r--r-- | llvm/tools/llvm-as/llvm-as.cpp | 1 |
7 files changed, 19 insertions, 5 deletions
diff --git a/llvm/include/llvm/Analysis/DSGraphTraits.h b/llvm/include/llvm/Analysis/DSGraphTraits.h index 0a25622d45f..4397f621c12 100644 --- a/llvm/include/llvm/Analysis/DSGraphTraits.h +++ b/llvm/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/llvm/include/llvm/Analysis/DataStructureGraph.h b/llvm/include/llvm/Analysis/DataStructureGraph.h index 0a25622d45f..4397f621c12 100644 --- a/llvm/include/llvm/Analysis/DataStructureGraph.h +++ b/llvm/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/llvm/include/llvm/CodeGen/MachineInstrAnnot.h b/llvm/include/llvm/CodeGen/MachineInstrAnnot.h index fa80c7297ff..d5f1da2edf5 100644 --- a/llvm/include/llvm/CodeGen/MachineInstrAnnot.h +++ b/llvm/include/llvm/CodeGen/MachineInstrAnnot.h @@ -93,4 +93,4 @@ public: }; -#endif MACHINE_INSTR_ANNOT_h +#endif diff --git a/llvm/include/llvm/Support/InstIterator.h b/llvm/include/llvm/Support/InstIterator.h index eb64113b7f4..4f8f2af6c52 100644 --- a/llvm/include/llvm/Support/InstIterator.h +++ b/llvm/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/llvm/tools/as/as.cpp b/llvm/tools/as/as.cpp index c66dd598b9b..36f84568783 100644 --- a/llvm/tools/as/as.cpp +++ b/llvm/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/llvm/tools/llvm-as/as.cpp b/llvm/tools/llvm-as/as.cpp index c66dd598b9b..36f84568783 100644 --- a/llvm/tools/llvm-as/as.cpp +++ b/llvm/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/llvm/tools/llvm-as/llvm-as.cpp b/llvm/tools/llvm-as/llvm-as.cpp index c66dd598b9b..36f84568783 100644 --- a/llvm/tools/llvm-as/llvm-as.cpp +++ b/llvm/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("-")); |
