diff options
| author | 2018-08-28 16:27:48 +0000 | |
|---|---|---|
| committer | 2018-08-28 16:27:48 +0000 | |
| commit | 6bfbdc7fe3751fb6af6ff65493ab9e0f74ed5ca8 (patch) | |
| tree | a2d391945f5b78e840155bbb420768d9dd402a5d /compiler/optimizing/intrinsics.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/optimizing/intrinsics.h')
| -rw-r--r-- | compiler/optimizing/intrinsics.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/optimizing/intrinsics.h b/compiler/optimizing/intrinsics.h index 993648f765..06e2fbb355 100644 --- a/compiler/optimizing/intrinsics.h +++ b/compiler/optimizing/intrinsics.h @@ -42,7 +42,7 @@ class IntrinsicsRecognizer : public HOptimization { const char* name = kIntrinsicsRecognizerPassName) : HOptimization(graph, name, stats) {} - bool Run() OVERRIDE; + bool Run() override; // Static helper that recognizes intrinsic call. Returns true on success. // If it fails due to invoke type mismatch, wrong_invoke_type is set. |