diff options
| -rw-r--r-- | llvm/lib/Target/MSIL/MSILWriter.h | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/llvm/lib/Target/MSIL/MSILWriter.h b/llvm/lib/Target/MSIL/MSILWriter.h index cbb2d31e7db..f1b6a696ada 100644 --- a/llvm/lib/Target/MSIL/MSILWriter.h +++ b/llvm/lib/Target/MSIL/MSILWriter.h @@ -85,15 +85,11 @@ namespace { 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; } |
