[llvm-commits] CVS: llvm/include/llvm/ADT/BitSetVector.h EquivalenceClasses.h

[Bill Wendling]

Changes in directory llvm/include/llvm/ADT:

BitSetVector.h updated: 1.17 -> 1.18
EquivalenceClasses.h updated: 1.18 -> 1.19
---
Log message:

Changed llvm_ostream et all to OStream. llvm_cerr, llvm_cout, llvm_null, are
now cerr, cout, and NullStream resp.


---
Diffs of the changes:  (+8 -6)

 BitSetVector.h       |   10 ++++++----
 EquivalenceClasses.h |    4 ++--
 2 files changed, 8 insertions(+), 6 deletions(-)


Index: llvm/include/llvm/ADT/BitSetVector.h
diff -u llvm/include/llvm/ADT/BitSetVector.h:1.17 llvm/include/llvm/ADT/BitSetVector.h:1.18
--- llvm/include/llvm/ADT/BitSetVector.h:1.17	Tue Nov 28 17:31:42 2006
+++ llvm/include/llvm/ADT/BitSetVector.h	Wed Dec  6 19:30:30 2006
@@ -29,7 +29,6 @@
 #include <bitset>
 #include <vector>
 #include <functional>
-#include <ostream>
 
 namespace llvm {
 
@@ -174,11 +173,11 @@
   ///
   ///  Printing and debugging support
   ///
-  void print(llvm_ostream &O) const {
+  void print(OStream &O) const {
     if (O.stream()) print(*O.stream());
   }
   void print(std::ostream &O) const;
-  void dump() const { print(llvm_cerr); }
+  void dump() const { print(cerr); }
 
 public:
   //
@@ -235,6 +234,9 @@
       return (I.bitvec == bitvec &&
               I.currentWord == currentWord && I.currentBit == currentBit);
     }
+    bool operator!=(const iterator& I) {
+      return !(*this == I);
+    }
 
   protected:
     static iterator begin(BitSetVector& _bitvec) { return iterator(_bitvec); }
@@ -252,7 +254,7 @@
     O << "<" << (*I) << ">" << (I+1 == E? "\n" : ", ");
 }
 
-inline llvm_ostream& operator<< (llvm_ostream& O, const BitSetVector& bset) {
+inline OStream& operator<< (OStream& O, const BitSetVector& bset) {
   bset.print(O);
   return O;
 }


Index: llvm/include/llvm/ADT/EquivalenceClasses.h
diff -u llvm/include/llvm/ADT/EquivalenceClasses.h:1.18 llvm/include/llvm/ADT/EquivalenceClasses.h:1.19
--- llvm/include/llvm/ADT/EquivalenceClasses.h:1.18	Tue Nov 28 17:31:42 2006
+++ llvm/include/llvm/ADT/EquivalenceClasses.h	Wed Dec  6 19:30:30 2006
@@ -43,8 +43,8 @@
 ///    if (!I->isLeader()) continue;   // Ignore non-leader sets.
 ///    for (EquivalenceClasses<int>::member_iterator MI = EC.member_begin(I);
 ///         MI != EC.member_end(); ++MI)   // Loop over members in this set.
-///      llvm_cerr << *MI << " ";  // Print member.
-///    llvm_cerr << "\n";   // Finish set.
+///      cerr << *MI << " ";  // Print member.
+///    cerr << "\n";   // Finish set.
 ///  }
 ///
 /// This example prints: