[llvm-commits] [llvm] r75673 - /llvm/trunk/lib/Target/MSIL/MSILWriter.h

[Chris Lattner]

Author: lattner
Date: Tue Jul 14 15:25:40 2009
New Revision: 75673

URL: http://llvm.org/viewvc/llvm-project?rev=75673&view=rev
Log:
fix David's merge conflict

Modified:
    llvm/trunk/lib/Target/MSIL/MSILWriter.h

Modified: llvm/trunk/lib/Target/MSIL/MSILWriter.h
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/MSIL/MSILWriter.h?rev=75673&r1=75672&r2=75673&view=diff

==============================================================================
--- llvm/trunk/lib/Target/MSIL/MSILWriter.h (original)
+++ llvm/trunk/lib/Target/MSIL/MSILWriter.h Tue Jul 14 15:25:40 2009
@@ -85,15 +85,11 @@
       StaticInitList;
     const std::set<const Type *>* UsedTypes;
     static char ID;
-<<<<<<< .mine
-    MSILWriter(formatted_raw_ostream &o) : FunctionPass(&ID), Out(o) {
-=======
     DenseMap<const Value*, unsigned> AnonValueNumbers;
     unsigned NextAnonValueNumber;
 
-    MSILWriter(raw_ostream &o)
-       : FunctionPass(&ID), Out(o), NextAnonValueNumber(0) {
->>>>>>> .r75668
+    MSILWriter(formatted_raw_ostream &o) : FunctionPass(&ID), Out(o),
+         NextAnonValueNumber(0) {
       UniqID = 0;
     }