summaryrefslogtreecommitdiffstats
path: root/runtime/base/allocator.h
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/allocator.h
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/allocator.h')
-rw-r--r--runtime/base/allocator.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/runtime/base/allocator.h b/runtime/base/allocator.h
index 3ca9ebbd5c..30f7f128e0 100644
--- a/runtime/base/allocator.h
+++ b/runtime/base/allocator.h
@@ -119,7 +119,7 @@ class TrackingAllocatorImpl {
// Used internally by STL data structures.
TrackingAllocatorImpl() throw() {
- COMPILE_ASSERT(kTag < kAllocatorTagCount, must_be_less_than_count);
+ static_assert(kTag < kAllocatorTagCount, "kTag must be less than kAllocatorTagCount");
}
// Enables an allocator for objects of one type to allocate storage for objects of another type.