Remove references to `bugpoint' from the now-generic system utilities.

[oota-llvm.git] / include / Support / ilist

diff --git a/include/Support/ilist b/include/Support/ilist
index 1d868f8a4a4218f0fafbac703dbb87e9216f2842..afd858d5590af09a30fb94289e9a1130033d6f52 100644 (file)
--- a/include/Support/ilist
+++ b/include/Support/ilist
@@ -28,10 +28,9 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef INCLUDED_SUPPORT_ILIST
-#define INCLUDED_SUPPORT_ILIST
+#ifndef SUPPORT_ILIST
+#define SUPPORT_ILIST
 
-#include <assert.h>
 #include <algorithm>
 #include <Support/iterator>
 
@@ -75,11 +74,13 @@ class ilist_iterator
   typedef ilist_traits<NodeTy> Traits;
   typedef bidirectional_iterator<NodeTy, ptrdiff_t> super;
 
+public:
+  typedef size_t size_type;
   typedef typename super::pointer pointer;
   typedef typename super::reference reference;
+private:
   pointer NodePtr;
 public:
-  typedef size_t size_type;
 
   ilist_iterator(pointer NP) : NodePtr(NP) {}
   ilist_iterator(reference NR) : NodePtr(&NR) {}