From 277ccbd200ea43590dfc06a93ae184a765327ad0 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Mon, 3 Nov 2014 21:36:10 -0800 Subject: ART: More warnings Enable -Wno-conversion-null, -Wredundant-decls and -Wshadow in general, and -Wunused-but-set-parameter for GCC builds. Change-Id: I81bbdd762213444673c65d85edae594a523836e5 --- compiler/utils/assembler.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'compiler/utils/assembler.h') diff --git a/compiler/utils/assembler.h b/compiler/utils/assembler.h index e1b6d7c21d..ad7e98d906 100644 --- a/compiler/utils/assembler.h +++ b/compiler/utils/assembler.h @@ -56,9 +56,9 @@ namespace x86_64 { class ExternalLabel { public: - ExternalLabel(const char* name, uintptr_t address) - : name_(name), address_(address) { - DCHECK(name != nullptr); + ExternalLabel(const char* name_in, uintptr_t address_in) + : name_(name_in), address_(address_in) { + DCHECK(name_in != nullptr); } const char* name() const { return name_; } @@ -140,10 +140,10 @@ class AssemblerFixup { int position_; AssemblerFixup* previous() const { return previous_; } - void set_previous(AssemblerFixup* previous) { previous_ = previous; } + void set_previous(AssemblerFixup* previous_in) { previous_ = previous_in; } int position() const { return position_; } - void set_position(int position) { position_ = position; } + void set_position(int position_in) { position_ = position_in; } friend class AssemblerBuffer; }; -- cgit v1.2.3-59-g8ed1b