diff options
| author | 2018-08-28 16:27:48 +0000 | |
|---|---|---|
| committer | 2018-08-28 16:27:48 +0000 | |
| commit | 6bfbdc7fe3751fb6af6ff65493ab9e0f74ed5ca8 (patch) | |
| tree | a2d391945f5b78e840155bbb420768d9dd402a5d /compiler/utils/assembler.h | |
| parent | aa317ffafe685b96993ffb2617c530f8b950480f (diff) | |
| parent | 625ca4759941299e8a9cc876c985558c4d76bdc0 (diff) | |
Merge changes If4de1e1f,I11493096,I256c7758
* changes:
Remove 'virtual' and 'override' qualifiers on final methods.
Remove superfluous 'virtual' specifiers in ART.
Use 'final' and 'override' specifiers directly in ART.
Diffstat (limited to 'compiler/utils/assembler.h')
| -rw-r--r-- | compiler/utils/assembler.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/utils/assembler.h b/compiler/utils/assembler.h index 379a6396eb..096410de3e 100644 --- a/compiler/utils/assembler.h +++ b/compiler/utils/assembler.h @@ -283,7 +283,7 @@ class AssemblerBuffer { // The purpose of this class is to ensure that we do not have to explicitly // call the AdvancePC method (which is good for convenience and correctness). -class DebugFrameOpCodeWriterForAssembler FINAL +class DebugFrameOpCodeWriterForAssembler final : public dwarf::DebugFrameOpCodeWriter<> { public: struct DelayedAdvancePC { @@ -292,7 +292,7 @@ class DebugFrameOpCodeWriterForAssembler FINAL }; // This method is called the by the opcode writers. - virtual void ImplicitlyAdvancePC() FINAL; + void ImplicitlyAdvancePC() final; explicit DebugFrameOpCodeWriterForAssembler(Assembler* buffer) : dwarf::DebugFrameOpCodeWriter<>(false /* enabled */), |