6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-02-21 06:30:16 +00:00
Code Issues Projects Releases Wiki Activity

fix David's merge conflict

Browse Source 
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@75673 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Chris Lattner 2009-07-14 20:25:40 +00:00
parent 9ac7542bab
commit 5473f07314
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Target/MSIL/MSILWriter.h
View File

@ -85,15 +85,11 @@ namespace {
StaticInitList; StaticInitList;
const std::set<const Type *>* UsedTypes; const std::set<const Type *>* UsedTypes;
static char ID; static char ID;
<<<<<<< .mine
MSILWriter(formatted_raw_ostream &o) : FunctionPass(&ID), Out(o) {
=======
DenseMap<const Value*, unsigned> AnonValueNumbers; DenseMap<const Value*, unsigned> AnonValueNumbers;
unsigned NextAnonValueNumber; unsigned NextAnonValueNumber;
MSILWriter(raw_ostream &o) MSILWriter(formatted_raw_ostream &o) : FunctionPass(&ID), Out(o),
: FunctionPass(&ID), Out(o), NextAnonValueNumber(0) { NextAnonValueNumber(0) {
>>>>>>> .r75668
UniqID = 0; UniqID = 0;
} }