diff options
author | Pierre Langlois <pierre.langlois@arm.com> | 2016-10-31 13:38:47 +0000 |
---|---|---|
committer | Pierre Langlois <pierre.langlois@arm.com> | 2016-10-31 18:15:37 +0000 |
commit | 3fac43c1a101f98f116e752b80abc122d32b83ac (patch) | |
tree | c08cf2d45371486b359775faba14893b8aef2e7c /src/aarch64/macro-assembler-aarch64.h | |
parent | cf2ad0b1016986df5c25cecab3f406b6cac6b0d7 (diff) |
Mark methods as `override` when compiling with C++11
This patch introduces a VIXL_OVERRIDE macro. When building with gcc
-std=c++11, we now enable the `-Wsuggest-override` warning so that we do
not forget to add them in the future.
Change-Id: I0f402599019ba9de1a7a654e9499f00a07f00201
Diffstat (limited to 'src/aarch64/macro-assembler-aarch64.h')
-rw-r--r-- | src/aarch64/macro-assembler-aarch64.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/aarch64/macro-assembler-aarch64.h b/src/aarch64/macro-assembler-aarch64.h index dbad4557..81a53d9c 100644 --- a/src/aarch64/macro-assembler-aarch64.h +++ b/src/aarch64/macro-assembler-aarch64.h @@ -576,7 +576,7 @@ class MacroAssembler : public Assembler, public MacroAssemblerInterface { PositionIndependentCodeOption pic = PositionIndependentCode); ~MacroAssembler(); - AssemblerBase* GetAssemblerBase() { return this; } + AssemblerBase* GetAssemblerBase() VIXL_OVERRIDE { return this; } // Start generating code from the beginning of the buffer, discarding any code // and data that has already been emitted into the buffer. @@ -2832,11 +2832,13 @@ class MacroAssembler : public Assembler, public MacroAssemblerInterface { void BumpSystemStackPointer(const Operand& space); #ifdef VIXL_DEBUG - void SetAllowMacroInstructions(bool value) { + void SetAllowMacroInstructions(bool value) VIXL_OVERRIDE { allow_macro_instructions_ = value; } - bool AllowMacroInstructions() const { return allow_macro_instructions_; } + bool AllowMacroInstructions() const VIXL_OVERRIDE { + return allow_macro_instructions_; + } #endif void SetGenerateSimulatorCode(bool value) { @@ -2852,12 +2854,12 @@ class MacroAssembler : public Assembler, public MacroAssemblerInterface { void ReleaseVeneerPool() { veneer_pool_.Release(); } bool IsVeneerPoolBlocked() const { return veneer_pool_.IsBlocked(); } - void BlockPools() { + void BlockPools() VIXL_OVERRIDE { BlockLiteralPool(); BlockVeneerPool(); } - void ReleasePools() { + void ReleasePools() VIXL_OVERRIDE { ReleaseLiteralPool(); ReleaseVeneerPool(); } @@ -2916,7 +2918,7 @@ class MacroAssembler : public Assembler, public MacroAssemblerInterface { } void CheckEmitPoolsFor(size_t amount); - void EnsureEmitPoolsFor(size_t amount) { + void EnsureEmitPoolsFor(size_t amount) VIXL_OVERRIDE { ptrdiff_t offset = amount; ptrdiff_t max_pools_size = literal_pool_.GetMaxSize() + veneer_pool_.GetMaxSize(); |