summaryrefslogtreecommitdiffstats
path: root/runtime/base/bit_vector.cc
diff options
context:
space:
mode:
authorAndreas Gampe <agampe@google.com>2014-11-03 23:41:03 -0800
committerAndreas Gampe <agampe@google.com>2014-11-03 23:41:03 -0800
commit575e78c41ece0dec969d31f46be563d4eb7ae43b (patch)
tree16906df0ba0912a6cb01b3139ba7c60d5f9d09b7 /runtime/base/bit_vector.cc
parent2998e9cdc9f19c30c4944a4726ed9f147de79ebd (diff)
downloadandroid_art-575e78c41ece0dec969d31f46be563d4eb7ae43b.tar.gz
android_art-575e78c41ece0dec969d31f46be563d4eb7ae43b.tar.bz2
android_art-575e78c41ece0dec969d31f46be563d4eb7ae43b.zip
ART: Replace COMPILE_ASSERT with static_assert (runtime)
Replace all occurrences of COMPILE_ASSERT in the runtime tree. Change-Id: I01e420899c760094fb342cc6cb9e692dd670a0b2
Diffstat (limited to 'runtime/base/bit_vector.cc')
-rw-r--r--runtime/base/bit_vector.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/runtime/base/bit_vector.cc b/runtime/base/bit_vector.cc
index 63e9355d2d..4390180cf2 100644
--- a/runtime/base/bit_vector.cc
+++ b/runtime/base/bit_vector.cc
@@ -41,8 +41,8 @@ BitVector::BitVector(uint32_t start_bits,
storage_size_(storage_size),
allocator_(allocator),
expandable_(expandable) {
- COMPILE_ASSERT(sizeof(*storage_) == kWordBytes, check_word_bytes);
- COMPILE_ASSERT(sizeof(*storage_) * 8u == kWordBits, check_word_bits);
+ static_assert(sizeof(*storage_) == kWordBytes, "word bytes");
+ static_assert(sizeof(*storage_) * 8u == kWordBits, "word bits");
if (storage_ == nullptr) {
storage_size_ = BitsToWords(start_bits);
storage_ = static_cast<uint32_t*>(allocator_->Alloc(storage_size_ * kWordBytes));