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/dex/mir_field_info.h | |
| parent | 07f09809c0575e985249450843b06f266b831fe1 (diff) | |
| download | art-785d2f2116bb57418d81bb55b55a087afee11053.tar.gz art-785d2f2116bb57418d81bb55b55a087afee11053.tar.bz2 art-785d2f2116bb57418d81bb55b55a087afee11053.zip | |
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/dex/mir_field_info.h')
| -rw-r--r-- | compiler/dex/mir_field_info.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/dex/mir_field_info.h b/compiler/dex/mir_field_info.h index c6281827cb..e97f7a00f5 100644 --- a/compiler/dex/mir_field_info.h +++ b/compiler/dex/mir_field_info.h @@ -130,7 +130,7 @@ class MirIFieldLoweringInfo : public MirFieldInfo { kBitFastPut, kIFieldLoweringInfoBitEnd }; - COMPILE_ASSERT(kIFieldLoweringInfoBitEnd <= 16, too_many_flags); + static_assert(kIFieldLoweringInfoBitEnd <= 16, "Too many flags"); static constexpr uint16_t kFlagFastGet = 1u << kBitFastGet; static constexpr uint16_t kFlagFastPut = 1u << kBitFastPut; @@ -198,7 +198,7 @@ class MirSFieldLoweringInfo : public MirFieldInfo { kBitClassIsInDexCache, kSFieldLoweringInfoBitEnd }; - COMPILE_ASSERT(kSFieldLoweringInfoBitEnd <= 16, too_many_flags); + static_assert(kSFieldLoweringInfoBitEnd <= 16, "Too many flags"); static constexpr uint16_t kFlagFastGet = 1u << kBitFastGet; static constexpr uint16_t kFlagFastPut = 1u << kBitFastPut; static constexpr uint16_t kFlagIsReferrersClass = 1u << kBitIsReferrersClass; |