From 785d2f2116bb57418d81bb55b55a087afee11053 Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Mon, 3 Nov 2014 22:57:30 -0800 Subject: ART: Replace COMPILE_ASSERT with static_assert (compiler) Replace all occurrences of COMPILE_ASSERT in the compiler tree. Change-Id: Icc40a38c8bdeaaf7305ab3352a838a2cd7e7d840 --- compiler/dex/quick/codegen_util.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'compiler/dex/quick/codegen_util.cc') diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index 80a1ac4c52..d594196aff 100644 --- a/compiler/dex/quick/codegen_util.cc +++ b/compiler/dex/quick/codegen_util.cc @@ -768,8 +768,8 @@ void Mir2Lir::CreateNativeGcMap() { int Mir2Lir::AssignLiteralOffset(CodeOffset offset) { offset = AssignLiteralOffsetCommon(literal_list_, offset); constexpr unsigned int ptr_size = sizeof(uint32_t); - COMPILE_ASSERT(ptr_size >= sizeof(mirror::HeapReference), - ptr_size_cannot_hold_a_heap_reference); + static_assert(ptr_size >= sizeof(mirror::HeapReference), + "Pointer size cannot hold a heap reference"); offset = AssignLiteralPointerOffsetCommon(code_literal_list_, offset, ptr_size); offset = AssignLiteralPointerOffsetCommon(method_literal_list_, offset, ptr_size); offset = AssignLiteralPointerOffsetCommon(class_literal_list_, offset, ptr_size); -- cgit v1.2.3-59-g8ed1b