Make some minor improvements to APInt:

[oota-llvm.git] / include / llvm / ADT / iterator.in

diff --git a/include/llvm/ADT/iterator.in b/include/llvm/ADT/iterator.in
index 93813e19859fbbc36c32b14354ecf00665432f90..47f70d12fdbcaeb3a41111c11c764b8d20e4e9e9 100644 (file)
--- a/include/llvm/ADT/iterator.in
+++ b/include/llvm/ADT/iterator.in
@@ -1,4 +1,4 @@
-//===-- Support/iterator - "Portable" wrapper around <iterator> -*- C++ -*-===//
+//===-- llvm/ADT/iterator - Portable wrapper around <iterator> --*- C++ -*-===//
 // 
 //                     The LLVM Compiler Infrastructure
 //
@@ -25,13 +25,23 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef SUPPORT_ITERATOR
-#define SUPPORT_ITERATOR
+#ifndef LLVM_ADT_ITERATOR
+#define LLVM_ADT_ITERATOR
 
 #include <iterator>
 
-#if !@HAVE_BI_ITERATOR@
-# if @HAVE_STD_ITERATOR@
+#undef HAVE_BI_ITERATOR
+#undef HAVE_STD_ITERATOR
+#undef HAVE_FWD_ITERATOR
+
+#ifdef _MSC_VER
+#  define HAVE_BI_ITERATOR 0
+#  define HAVE_STD_ITERATOR 1
+#  define HAVE_FWD_ITERATOR 0
+#endif
+
+#if !HAVE_BI_ITERATOR
+# if HAVE_STD_ITERATOR
 /// If the bidirectional iterator is not defined, we attempt to define it in
 /// terms of the C++ standard iterator. Otherwise, we import it with a "using"
 /// statement.
@@ -47,8 +57,8 @@ struct bidirectional_iterator
 using std::bidirectional_iterator;
 #endif
 
-#if !@HAVE_FWD_ITERATOR@
-# if @HAVE_STD_ITERATOR@
+#if !HAVE_FWD_ITERATOR
+# if HAVE_STD_ITERATOR
 /// If the forward iterator is not defined, attempt to define it in terms of
 /// the C++ standard iterator. Otherwise, we import it with a "using" statement.
 ///