diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-04 07:51:34 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-11-04 07:51:34 +0000 |
| commit | ad17d41841ba1fb177fb0bf175ec0e9f5e1412b3 (patch) | |
| tree | e3bf8fb6a51eed07d4cd3e2d007acbb8723ed6df /compiler/jni | |
| parent | 8851cbaeb75f5a89ec88cbf4b26d6f846bbf6411 (diff) | |
| parent | 785d2f2116bb57418d81bb55b55a087afee11053 (diff) | |
| download | art-ad17d41841ba1fb177fb0bf175ec0e9f5e1412b3.zip art-ad17d41841ba1fb177fb0bf175ec0e9f5e1412b3.tar.gz art-ad17d41841ba1fb177fb0bf175ec0e9f5e1412b3.tar.bz2 | |
Merge "ART: Replace COMPILE_ASSERT with static_assert (compiler)"
Diffstat (limited to 'compiler/jni')
| -rw-r--r-- | compiler/jni/quick/arm/calling_convention_arm.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/jni/quick/arm/calling_convention_arm.cc b/compiler/jni/quick/arm/calling_convention_arm.cc index 9545896..769cd4c 100644 --- a/compiler/jni/quick/arm/calling_convention_arm.cc +++ b/compiler/jni/quick/arm/calling_convention_arm.cc @@ -34,8 +34,8 @@ static const DRegister kHFDArgumentRegisters[] = { D0, D1, D2, D3, D4, D5, D6, D7 }; -COMPILE_ASSERT(arraysize(kHFDArgumentRegisters) * 2 == arraysize(kHFSArgumentRegisters), - ks_d_argument_registers_mismatch); +static_assert(arraysize(kHFDArgumentRegisters) * 2 == arraysize(kHFSArgumentRegisters), + "ks d argument registers mismatch"); // Calling convention |