*** empty log message ***

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

2 files changed, 9 insertions, 6 deletions

diff --git a/include/llvm/Analysis/ConstantsScanner.h b/include/llvm/Analysis/ConstantsScanner.h
index ca0a80e..5e0ee61 100644
--- a/include/llvm/Analysis/ConstantsScanner.h
+++ b/include/llvm/Analysis/ConstantsScanner.h
@@ -11,11 +11,10 @@
 
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Instruction.h"
-#include <iterator>
+#include <Support/iterator>
 class Constant;
 
-class constant_iterator
-  : public std::forward_iterator<const Constant, ptrdiff_t> {
+class constant_iterator : public forward_iterator<const Constant, ptrdiff_t> {
   const_inst_iterator InstI;                // Method instruction iterator
   unsigned OpIdx;                           // Operand index
 
diff --git a/include/llvm/Support/CFG.h b/include/llvm/Support/CFG.h
index c2a4775..e38295c 100644
--- a/include/llvm/Support/CFG.h
+++ b/include/llvm/Support/CFG.h
@@ -12,18 +12,20 @@
 #include "llvm/Function.h"
 #include "llvm/BasicBlock.h"
 #include "llvm/InstrTypes.h"
-#include <iterator>
+#include "Support/iterator"
 
 //===--------------------------------------------------------------------===//
 // BasicBlock pred_iterator definition
 //===--------------------------------------------------------------------===//
 
 template <class _Ptr,  class _USE_iterator> // Predecessor Iterator
-class PredIterator : public std::bidirectional_iterator<_Ptr, ptrdiff_t> {
+class PredIterator : public bidirectional_iterator<_Ptr, ptrdiff_t> {
+  typedef bidirectional_iterator<_Ptr, ptrdiff_t> super;
   _Ptr *BB;
   _USE_iterator It;
 public:
   typedef PredIterator<_Ptr,_USE_iterator> _Self;
+  typedef typename super::pointer pointer;
   
   inline void advancePastConstants() {
     // TODO: This is bad
@@ -82,11 +84,13 @@ inline pred_const_iterator pred_end(const BasicBlock *BB) {
 //===--------------------------------------------------------------------===//
 
 template <class _Term, class _BB>           // Successor Iterator
-class SuccIterator : public std::bidirectional_iterator<_BB, ptrdiff_t> {
+class SuccIterator : public bidirectional_iterator<_BB, ptrdiff_t> {
   const _Term Term;
   unsigned idx;
+  typedef bidirectional_iterator<_BB, ptrdiff_t> super;
 public:
   typedef SuccIterator<_Term, _BB> _Self;
+  typedef typename super::pointer pointer;
   // TODO: This can be random access iterator, need operator+ and stuff tho
     
   inline SuccIterator(_Term T) : Term(T), idx(0) {         // begin iterator