From patchwork Wed Mar 16 05:16:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sachin Kamat X-Patchwork-Id: 608 Return-Path: Delivered-To: unknown Received: from imap.gmail.com (74.125.159.109) by localhost6.localdomain6 with IMAP4-SSL; 08 Jun 2011 14:44:06 -0000 Delivered-To: patches@linaro.org Received: by 10.151.46.5 with SMTP id y5cs90952ybj; Tue, 15 Mar 2011 22:28:45 -0700 (PDT) Received: by 10.142.144.15 with SMTP id r15mr285667wfd.439.1300253325336; Tue, 15 Mar 2011 22:28:45 -0700 (PDT) Received: from mailout2.samsung.com (mailout2.samsung.com [203.254.224.25]) by mx.google.com with ESMTP id s39si1381311wfc.18.2011.03.15.22.28.44; Tue, 15 Mar 2011 22:28:45 -0700 (PDT) Received-SPF: neutral (google.com: 203.254.224.25 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) client-ip=203.254.224.25; Authentication-Results: mx.google.com; spf=neutral (google.com: 203.254.224.25 is neither permitted nor denied by best guess record for domain of sachin.kamat@linaro.org) smtp.mail=sachin.kamat@linaro.org Received: from epmmp1 (mailout2.samsung.com [203.254.224.25]) by mailout2.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LI4004ZCXVVQFC0@mailout2.samsung.com>; Wed, 16 Mar 2011 14:28:43 +0900 (KST) Received: from Linaro.sisodomain.com ([107.108.215.143]) by mmp1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LI400DA3XVI9T@mmp1.samsung.com>; Wed, 16 Mar 2011 14:28:43 +0900 (KST) Date: Wed, 16 Mar 2011 10:46:33 +0530 From: Sachin Kamat Subject: [PATCH-Android] [android/external/skia] Modified to avoid build errors using GCC 4.5/4.6. In-reply-to: <1300252598-1653-1-git-send-email-sachin.kamat@linaro.org> To: linaro-dev@lists.linaro.org Cc: patches@linaro.org Message-id: <1300252598-1653-5-git-send-email-sachin.kamat@linaro.org> X-Mailer: git-send-email 1.7.1 Content-transfer-encoding: 7BIT References: <1300252598-1653-1-git-send-email-sachin.kamat@linaro.org> Signed-off-by: Sachin Kamat Change-Id: Ibebec39dfd1e083a052870927a4129fdeca7cf8a --- src/images/SkFlipPixelRef.cpp | 2 +- src/images/SkImageRef_GlobalPool.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/images/SkFlipPixelRef.cpp b/src/images/SkFlipPixelRef.cpp index 8d0f15a..bdf4d0a 100644 --- a/src/images/SkFlipPixelRef.cpp +++ b/src/images/SkFlipPixelRef.cpp @@ -74,7 +74,7 @@ SkPixelRef* SkFlipPixelRef::Create(SkFlattenableReadBuffer& buffer) { return SkNEW_ARGS(SkFlipPixelRef, (buffer)); } -static SkPixelRef::Registrar::Registrar reg("SkFlipPixelRef", +static SkPixelRef::Registrar reg("SkFlipPixelRef", SkFlipPixelRef::Create); /////////////////////////////////////////////////////////////////////////////// diff --git a/src/images/SkImageRef_GlobalPool.cpp b/src/images/SkImageRef_GlobalPool.cpp index 1f0bc43..15d3f0d 100644 --- a/src/images/SkImageRef_GlobalPool.cpp +++ b/src/images/SkImageRef_GlobalPool.cpp @@ -50,7 +50,7 @@ SkPixelRef* SkImageRef_GlobalPool::Create(SkFlattenableReadBuffer& buffer) { return SkNEW_ARGS(SkImageRef_GlobalPool, (buffer)); } -static SkPixelRef::Registrar::Registrar reg("SkImageRef_GlobalPool", +static SkPixelRef::Registrar reg("SkImageRef_GlobalPool", SkImageRef_GlobalPool::Create); ///////////////////////////////////////////////////////////////////////////////