summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNicolas Geoffray <ngeoffray@google.com>2014-07-17 09:16:19 +0100
committerNicolas Geoffray <ngeoffray@google.com>2014-07-17 09:16:19 +0100
commit169277a12ed857d0d8ba1b808e0e7e414a5d0f95 (patch)
treed34e44ff565ea8c113c4dda3d8e082a58c99d6e6
parentb0777f04c9d79a43c2e490716fe4300f1fb68df7 (diff)
downloadandroid_art-169277a12ed857d0d8ba1b808e0e7e414a5d0f95.tar.gz
android_art-169277a12ed857d0d8ba1b808e0e7e414a5d0f95.tar.bz2
android_art-169277a12ed857d0d8ba1b808e0e7e414a5d0f95.zip
Fix lint errors.
Change-Id: I7bbaad590d84db97acfa7f8c4d093bc40e64684a
-rw-r--r--compiler/utils/arm/assembler_thumb2.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/utils/arm/assembler_thumb2.h b/compiler/utils/arm/assembler_thumb2.h
index f1ae3d805c..ee33bf23c9 100644
--- a/compiler/utils/arm/assembler_thumb2.h
+++ b/compiler/utils/arm/assembler_thumb2.h
@@ -31,7 +31,7 @@ namespace arm {
class Thumb2Assembler FINAL : public ArmAssembler {
public:
- Thumb2Assembler(bool force_32bit_branches = false)
+ explicit Thumb2Assembler(bool force_32bit_branches = false)
: force_32bit_branches_(force_32bit_branches),
force_32bit_(false),
it_cond_index_(kNoItCondition),
@@ -419,8 +419,8 @@ class Thumb2Assembler FINAL : public ArmAssembler {
void EmitShift(Register rd, Register rm, Shift shift, uint8_t amount, bool setcc = false);
void EmitShift(Register rd, Register rn, Shift shift, Register rm, bool setcc = false);
- bool force_32bit_branches_; // Force the assembler to use 32 bit branch instructions.
- bool force_32bit_; // Force the assembler to use 32 bit thumb2 instructions.
+ bool force_32bit_branches_; // Force the assembler to use 32 bit branch instructions.
+ bool force_32bit_; // Force the assembler to use 32 bit thumb2 instructions.
// IfThen conditions. Used to check that conditional instructions match the preceding IT.
Condition it_conditions_[4];