From 88b2b80aed15bb1f931cddd40e44ca525ef10018 Mon Sep 17 00:00:00 2001 From: Vladimir Marko Date: Fri, 4 Dec 2015 14:19:04 +0000 Subject: Allow initializing runtime with parsed options. Needed by upcoming refactoring of dex2oat to allow early writing of dex files to the oat file. Change-Id: Ia13c26132846801522f181f51f64035d625e8416 --- compiler/utils/arm/assembler_arm.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'compiler/utils/arm/assembler_arm.h') diff --git a/compiler/utils/arm/assembler_arm.h b/compiler/utils/arm/assembler_arm.h index 4a6e6d7c3f..98a1a8f9a1 100644 --- a/compiler/utils/arm/assembler_arm.h +++ b/compiler/utils/arm/assembler_arm.h @@ -22,6 +22,7 @@ #include "base/bit_utils.h" #include "base/logging.h" +#include "base/stl_util.h" #include "base/value_object.h" #include "constants_arm.h" #include "utils/arm/managed_register_arm.h" @@ -697,10 +698,9 @@ class ArmAssembler : public Assembler { // Most of these are pure virtual as they need to be implemented per instruction set. // Create a new literal with a given value. - // NOTE: Force the template parameter to be explicitly specified. In the absence of - // std::omit_from_type_deduction or std::identity, use std::decay. + // NOTE: Force the template parameter to be explicitly specified. template - Literal* NewLiteral(typename std::decay::type value) { + Literal* NewLiteral(typename Identity::type value) { static_assert(std::is_integral::value, "T must be an integral type."); return NewLiteral(sizeof(value), reinterpret_cast(&value)); } -- cgit v1.2.3-59-g8ed1b