diff options
| author | 2016-09-15 18:16:43 +0000 | |
|---|---|---|
| committer | 2016-09-15 18:16:44 +0000 | |
| commit | 6b4d988feb18559204f7175914851baf28febd8c (patch) | |
| tree | b8bb9bf3e2bcc3a2219ec5385aa003058cb717e9 /compiler/utils/arm/assembler_arm.h | |
| parent | 5a7c611d7e9ab5d01eca58010b5dfc22d7ca720e (diff) | |
| parent | a5931185c97c7b17981a9fc5016834a0bdd9480b (diff) | |
Merge "Fix google-explicit-constructor warnings in art."
Diffstat (limited to 'compiler/utils/arm/assembler_arm.h')
| -rw-r--r-- | compiler/utils/arm/assembler_arm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler/utils/arm/assembler_arm.h b/compiler/utils/arm/assembler_arm.h index 3084e6e2b6..aefbf26db7 100644 --- a/compiler/utils/arm/assembler_arm.h +++ b/compiler/utils/arm/assembler_arm.h @@ -246,7 +246,7 @@ class Address : public ValueObject { NegPostIndex = (0|0|0) << 21 // negative post-indexed with writeback }; - Address(Register rn, int32_t offset = 0, Mode am = Offset) : rn_(rn), rm_(R0), + explicit Address(Register rn, int32_t offset = 0, Mode am = Offset) : rn_(rn), rm_(R0), offset_(offset), am_(am), is_immed_offset_(true), shift_(LSL) { } |