From da4d79bc9a4aeb9da7c6259ce4c9c1c3bf545eb8 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Tue, 24 Mar 2015 14:36:11 +0000 Subject: Unify ART's various implementations of bit_cast. ART had several implementations of art::bit_cast: 1. one in runtime/base/casts.h, declared as: template inline Dest bit_cast(const Source& source); 2. another one in runtime/utils.h, declared as: template static inline V bit_cast(U in); 3. and a third local version, in runtime/memory_region.h, similar to the previous one: template static Destination MemoryRegion::local_bit_cast(Source in); This CL removes versions 2. and 3. and changes their callers to use 1. instead. That version was chosen over the others as: - it was the oldest one in the code base; and - its syntax was closer to the standard C++ cast operators, as it supports the following use: bit_cast(source) since `Source' can be deduced from `source'. Change-Id: I7334fd5d55bf0b8a0c52cb33cfbae6894ff83633 --- runtime/interpreter/unstarted_runtime.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'runtime/interpreter') diff --git a/runtime/interpreter/unstarted_runtime.cc b/runtime/interpreter/unstarted_runtime.cc index fbbc863a98..98dfdbd2ea 100644 --- a/runtime/interpreter/unstarted_runtime.cc +++ b/runtime/interpreter/unstarted_runtime.cc @@ -460,7 +460,7 @@ static void UnstartedObjectHashCode( static void UnstartedDoubleDoubleToRawLongBits( Thread* self ATTRIBUTE_UNUSED, ShadowFrame* shadow_frame, JValue* result, size_t arg_offset) { double in = shadow_frame->GetVRegDouble(arg_offset); - result->SetJ(bit_cast(in)); + result->SetJ(bit_cast(in)); } static mirror::Object* GetDexFromDexCache(Thread* self, mirror::DexCache* dex_cache) -- cgit v1.2.3