| Index: src/IceAssembler.h
|
| diff --git a/src/IceAssembler.h b/src/IceAssembler.h
|
| index 437dfc33ad2b8d737a1f48ac59f952dea1740ab6..8ae935592c5c9a7d1c1f34521b90c30aba3b9bf9 100644
|
| --- a/src/IceAssembler.h
|
| +++ b/src/IceAssembler.h
|
| @@ -76,7 +76,7 @@ public:
|
| EnsureCapacity &operator=(const EnsureCapacity &) = delete;
|
|
|
| public:
|
| - explicit EnsureCapacity(AssemblerBuffer *Buffer) : Buffer(Buffer) {
|
| + explicit EnsureCapacity(AssemblerBuffer *MyBuffer) : Buffer(MyBuffer) {
|
| if (Buffer->cursor() >= Buffer->limit())
|
| Buffer->extendCapacity();
|
| if (BuildDefs::asserts())
|
| @@ -195,8 +195,8 @@ public:
|
|
|
| const FixupRefList &fixups() const { return Buffer.fixups(); }
|
|
|
| - AssemblerFixup *createFixup(FixupKind Kind, const Constant *Value) {
|
| - return Buffer.createFixup(Kind, Value);
|
| + AssemblerFixup *createFixup(FixupKind FKind, const Constant *Value) {
|
| + return Buffer.createFixup(FKind, Value);
|
| }
|
|
|
| void emitIASBytes(GlobalContext *Ctx) const;
|
| @@ -213,8 +213,8 @@ public:
|
| AssemblerKind getKind() const { return Kind; }
|
|
|
| protected:
|
| - explicit Assembler(AssemblerKind Kind)
|
| - : Kind(Kind), Allocator(), Buffer(*this) {}
|
| + explicit Assembler(AssemblerKind MyKind)
|
| + : Kind(MyKind), Allocator(), Buffer(*this) {}
|
|
|
| private:
|
| const AssemblerKind Kind;
|
|
|