For PR1338: rename include/llvm/ADT/ilist and friends to end with ".h"

[oota-llvm.git] / include / llvm / Analysis / ConstantsScanner.h

diff --git a/include/llvm/Analysis/ConstantsScanner.h b/include/llvm/Analysis/ConstantsScanner.h
index ca0a80e31e9a0f51d4fae8b8751a4354491f6b26..c52b24efe8b811fc8350025bfcb1baccabe666e6 100644 (file)
--- a/include/llvm/Analysis/ConstantsScanner.h
+++ b/include/llvm/Analysis/ConstantsScanner.h
@@ -1,7 +1,14 @@
-//==-- llvm/Analysis/ConstantsScanner.h - Iterate over constants -*- C++ -*-==//
+//==- llvm/Analysis/ConstantsScanner.h - Iterate over constants -*- C++ -*-===//
+//
+//                     The LLVM Compiler Infrastructure
+//
+// This file is distributed under the University of Illinois Open Source
+// License. See LICENSE.TXT for details.
+//
+//===----------------------------------------------------------------------===//
 //
 // This class implements an iterator to walk through the constants referenced by
-// a method.  This is used by the Bytecode & Assembly writers to build constant
+// a method.  This is used by the Bitcode & Assembly writers to build constant
 // pools.
 //
 //===----------------------------------------------------------------------===//
@@ -11,11 +18,13 @@
 
 #include "llvm/Support/InstIterator.h"
 #include "llvm/Instruction.h"
-#include <iterator>
+#include "llvm/ADT/iterator.h"
+
+namespace llvm {
+
 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
 
@@ -23,7 +32,7 @@ class constant_iterator
 
   inline bool isAtConstant() const {
     assert(!InstI.atEnd() && OpIdx < InstI->getNumOperands() &&
-          "isAtConstant called with invalid arguments!");
+           "isAtConstant called with invalid arguments!");
     return isa<Constant>(InstI->getOperand(OpIdx));
   }
 
@@ -31,7 +40,7 @@ public:
   inline constant_iterator(const Function *F) : InstI(inst_begin(F)), OpIdx(0) {
     // Advance to first constant... if we are not already at constant or end
     if (InstI != inst_end(F) &&                            // InstI is valid?
-       (InstI->getNumOperands() == 0 || !isAtConstant())) // Not at constant?
+        (InstI->getNumOperands() == 0 || !isAtConstant())) // Not at constant?
       operator++();
   }
 
@@ -39,8 +48,8 @@ public:
     : InstI(inst_end(F)), OpIdx(0) {
   }
 
-  inline bool operator==(const _Self& x) const { return OpIdx == x.OpIdx && 
-                                                       InstI == x.InstI; }
+  inline bool operator==(const _Self& x) const { return OpIdx == x.OpIdx &&
+                                                        InstI == x.InstI; }
   inline bool operator!=(const _Self& x) const { return !operator==(x); }
 
   inline pointer operator*() const {
@@ -54,7 +63,7 @@ public:
     do {
       unsigned NumOperands = InstI->getNumOperands();
       while (OpIdx < NumOperands && !isAtConstant()) {
-       ++OpIdx;
+        ++OpIdx;
       }
 
       if (OpIdx < NumOperands) return *this;  // Found a constant!
@@ -66,7 +75,7 @@ public:
   }
 
   inline _Self operator++(int) { // Postincrement
-    _Self tmp = *this; ++*this; return tmp; 
+    _Self tmp = *this; ++*this; return tmp;
   }
 
   inline bool atEnd() const { return InstI.atEnd(); }
@@ -80,4 +89,6 @@ inline constant_iterator constant_end(const Function *F) {
   return constant_iterator(F, true);
 }
 
+} // End llvm namespace
+
 #endif