Analysis: Reformulate WillNotOverflowUnsignedAdd for reusability

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

diff --git a/include/llvm/Analysis/ConstantsScanner.h b/include/llvm/Analysis/ConstantsScanner.h
index bac551f0492ad764a30792b68baa71587335e323..d3d0a44bd6d4375a026e0c85688b3b6681bae807 100644 (file)
--- a/include/llvm/Analysis/ConstantsScanner.h
+++ b/include/llvm/Analysis/ConstantsScanner.h
@@ -16,14 +16,14 @@
 #ifndef LLVM_ANALYSIS_CONSTANTSSCANNER_H
 #define LLVM_ANALYSIS_CONSTANTSSCANNER_H
 
-#include "llvm/Support/InstIterator.h"
-#include "llvm/ADT/iterator.h"
+#include "llvm/IR/InstIterator.h"
 
 namespace llvm {
 
 class Constant;
 
-class constant_iterator : public forward_iterator<const Constant, ptrdiff_t> {
+class constant_iterator : public std::iterator<std::forward_iterator_tag,
+                                               const Constant, ptrdiff_t> {
   const_inst_iterator InstI;                // Method instruction iterator
   unsigned OpIdx;                           // Operand index