diff options
| author | 2014-11-04 07:51:34 +0000 | |
|---|---|---|
| committer | 2014-11-04 07:51:34 +0000 | |
| commit | ad17d41841ba1fb177fb0bf175ec0e9f5e1412b3 (patch) | |
| tree | e3bf8fb6a51eed07d4cd3e2d007acbb8723ed6df /compiler/dex/quick/codegen_util.cc | |
| parent | 8851cbaeb75f5a89ec88cbf4b26d6f846bbf6411 (diff) | |
| parent | 785d2f2116bb57418d81bb55b55a087afee11053 (diff) | |
Merge "ART: Replace COMPILE_ASSERT with static_assert (compiler)"
Diffstat (limited to 'compiler/dex/quick/codegen_util.cc')
| -rw-r--r-- | compiler/dex/quick/codegen_util.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/dex/quick/codegen_util.cc b/compiler/dex/quick/codegen_util.cc index 4bc8967ce5..9403516641 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<mirror::Object>), - ptr_size_cannot_hold_a_heap_reference); + static_assert(ptr_size >= sizeof(mirror::HeapReference<mirror::Object>), + "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); |