diff options
| author | Andreas Gampe <agampe@google.com> | 2014-11-03 22:57:30 -0800 |
|---|---|---|
| committer | Andreas Gampe <agampe@google.com> | 2014-11-03 23:40:41 -0800 |
| commit | 785d2f2116bb57418d81bb55b55a087afee11053 (patch) | |
| tree | 34e7ea4f2c7473c8fe173c64451b4153fc909cd7 /compiler/optimizing/locations.h | |
| parent | 07f09809c0575e985249450843b06f266b831fe1 (diff) | |
| download | art-785d2f2116bb57418d81bb55b55a087afee11053.zip art-785d2f2116bb57418d81bb55b55a087afee11053.tar.gz art-785d2f2116bb57418d81bb55b55a087afee11053.tar.bz2 | |
ART: Replace COMPILE_ASSERT with static_assert (compiler)
Replace all occurrences of COMPILE_ASSERT in the compiler tree.
Change-Id: Icc40a38c8bdeaaf7305ab3352a838a2cd7e7d840
Diffstat (limited to 'compiler/optimizing/locations.h')
| -rw-r--r-- | compiler/optimizing/locations.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/compiler/optimizing/locations.h b/compiler/optimizing/locations.h index d7295aa..7e45ffc 100644 --- a/compiler/optimizing/locations.h +++ b/compiler/optimizing/locations.h @@ -71,16 +71,16 @@ class Location : public ValueObject { Location() : value_(kInvalid) { // Verify that non-constant location kinds do not interfere with kConstant. - COMPILE_ASSERT((kInvalid & kLocationConstantMask) != kConstant, TagError); - COMPILE_ASSERT((kUnallocated & kLocationConstantMask) != kConstant, TagError); - COMPILE_ASSERT((kStackSlot & kLocationConstantMask) != kConstant, TagError); - COMPILE_ASSERT((kDoubleStackSlot & kLocationConstantMask) != kConstant, TagError); - COMPILE_ASSERT((kRegister & kLocationConstantMask) != kConstant, TagError); - COMPILE_ASSERT((kQuickParameter & kLocationConstantMask) != kConstant, TagError); - COMPILE_ASSERT((kFpuRegister & kLocationConstantMask) != kConstant, TagError); - COMPILE_ASSERT((kRegisterPair & kLocationConstantMask) != kConstant, TagError); - COMPILE_ASSERT((kFpuRegisterPair & kLocationConstantMask) != kConstant, TagError); - COMPILE_ASSERT((kConstant & kLocationConstantMask) == kConstant, TagError); + static_assert((kInvalid & kLocationConstantMask) != kConstant, "TagError"); + static_assert((kUnallocated & kLocationConstantMask) != kConstant, "TagError"); + static_assert((kStackSlot & kLocationConstantMask) != kConstant, "TagError"); + static_assert((kDoubleStackSlot & kLocationConstantMask) != kConstant, "TagError"); + static_assert((kRegister & kLocationConstantMask) != kConstant, "TagError"); + static_assert((kQuickParameter & kLocationConstantMask) != kConstant, "TagError"); + static_assert((kFpuRegister & kLocationConstantMask) != kConstant, "TagError"); + static_assert((kRegisterPair & kLocationConstantMask) != kConstant, "TagError"); + static_assert((kFpuRegisterPair & kLocationConstantMask) != kConstant, "TagError"); + static_assert((kConstant & kLocationConstantMask) == kConstant, "TagError"); DCHECK(!IsValid()); } |