From 46ec81572bcbf4d80a6ffb607d9159d3212de9d5 Mon Sep 17 00:00:00 2001 From: "commit-bot@chromium.org" Date: Mon, 16 Dec 2013 23:51:11 +0000 Subject: [PATCH] The register keyword is deprecated in C++, even at -O0, registers are used automatically. Having the register keyword there causes a warning about deprecated keywords when using clang (and possibly future gcc versions), and isn't needed. Patch originally submitted to AOSP https://android-review.googlesource.com/#/c/72501 R=mtklein@google.com, scroggo@google.com, reed@google.com Author: djsollen@google.com Review URL: https://codereview.chromium.org/93703005 git-svn-id: http://skia.googlecode.com/svn/trunk@12702 2bbb7eff-a529-9590-31e7-b0007b416f81 --- include/core/SkFixed.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/core/SkFixed.h b/include/core/SkFixed.h index acfbe9a..95a32a4 100644 --- a/include/core/SkFixed.h +++ b/include/core/SkFixed.h @@ -196,7 +196,7 @@ inline bool SkFixedNearlyZero(SkFixed x, SkFixed tolerance = SK_FixedNearlyZero) */ inline SkFixed SkFloatToFixed_arm(float x) { - register int32_t y, z; + int32_t y, z; asm("movs %1, %3, lsl #1 \n" "mov %2, #0x8E \n" "sub %1, %2, %1, lsr #24 \n" @@ -213,7 +213,7 @@ inline bool SkFixedNearlyZero(SkFixed x, SkFixed tolerance = SK_FixedNearlyZero) } inline SkFixed SkFixedMul_arm(SkFixed x, SkFixed y) { - register int32_t t; + int32_t t; asm("smull %0, %2, %1, %3 \n" "mov %0, %0, lsr #16 \n" "orr %0, %0, %2, lsl #16 \n" @@ -225,7 +225,7 @@ inline bool SkFixedNearlyZero(SkFixed x, SkFixed tolerance = SK_FixedNearlyZero) } inline SkFixed SkFixedMulAdd_arm(SkFixed x, SkFixed y, SkFixed a) { - register int32_t t; + int32_t t; asm("smull %0, %3, %1, %4 \n" "add %0, %2, %0, lsr #16 \n" "add %0, %0, %3, lsl #16 \n" @@ -237,7 +237,7 @@ inline bool SkFixedNearlyZero(SkFixed x, SkFixed tolerance = SK_FixedNearlyZero) } inline SkFixed SkFractMul_arm(SkFixed x, SkFixed y) { - register int32_t t; + int32_t t; asm("smull %0, %2, %1, %3 \n" "mov %0, %0, lsr #30 \n" "orr %0, %0, %2, lsl #2 \n" -- 2.7.4