remove const modifiers on function return types (unneeded, and caused an error

on some gccs).

git-svn-id: http://skia.googlecode.com/svn/trunk@425 2bbb7eff-a529-9590-31e7-b0007b416f81

diff --git a/include/core/SkBlitRow.h b/include/core/SkBlitRow.h
index 6560d48..7d48b0c 100644 (file)
--- a/include/core/SkBlitRow.h
+++ b/include/core/SkBlitRow.h
@@ -71,9 +71,9 @@ public:
         system default.
      */
 
-    static const Proc32 PlatformProcs32(unsigned flags);
-    static const Proc PlatformProcs565(unsigned flags);
-    static const Proc PlatformProcs4444(unsigned flags);
+    static Proc32 PlatformProcs32(unsigned flags);
+    static Proc PlatformProcs565(unsigned flags);
+    static Proc PlatformProcs4444(unsigned flags);
 
 private:
     enum {

diff --git a/src/opts/SkBlitRow_opts_SSE2.cpp b/src/opts/SkBlitRow_opts_SSE2.cpp
index 772c8eb..7428584 100644 (file)
--- a/src/opts/SkBlitRow_opts_SSE2.cpp
+++ b/src/opts/SkBlitRow_opts_SSE2.cpp
@@ -317,15 +317,15 @@ static const SkBlitRow::Proc32 platform_32_procs[] = {
     S32A_Blend_BlitRow32_SSE2,          // S32A_Blend,
 };
 
-const SkBlitRow::Proc SkBlitRow::PlatformProcs4444(unsigned flags) {
+SkBlitRow::Proc SkBlitRow::PlatformProcs4444(unsigned flags) {
     return NULL;
 }
 
-const SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) {
+SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) {
     return NULL;
 }
 
-const SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) {
+SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) {
     static bool once;
     static bool hasSSE2;
     if (!once) {

diff --git a/src/opts/SkBlitRow_opts_arm.cpp b/src/opts/SkBlitRow_opts_arm.cpp
index 44550da..ae77bca 100644 (file)
--- a/src/opts/SkBlitRow_opts_arm.cpp
+++ b/src/opts/SkBlitRow_opts_arm.cpp
@@ -1011,14 +1011,14 @@ static const SkBlitRow::Proc32 platform_32_procs[] = {
     NULL,   // S32A_Blend,
 };
 
-const SkBlitRow::Proc SkBlitRow::PlatformProcs4444(unsigned flags) {
+SkBlitRow::Proc SkBlitRow::PlatformProcs4444(unsigned flags) {
     return platform_4444_procs[flags];
 }
 
-const SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) {
+SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) {
     return platform_565_procs[flags];
 }
 
-const SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) {
+SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) {
     return platform_32_procs[flags];
 }

diff --git a/src/opts/SkBlitRow_opts_none.cpp b/src/opts/SkBlitRow_opts_none.cpp
index 15b999b..8e0cddc 100644 (file)
--- a/src/opts/SkBlitRow_opts_none.cpp
+++ b/src/opts/SkBlitRow_opts_none.cpp
@@ -2,14 +2,14 @@
 
 // Platform impl of Platform_procs with no overrides
 
-const SkBlitRow::Proc SkBlitRow::PlatformProcs4444(unsigned flags) {
+SkBlitRow::Proc SkBlitRow::PlatformProcs4444(unsigned flags) {
     return NULL;
 }
 
-const SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) {
+SkBlitRow::Proc SkBlitRow::PlatformProcs565(unsigned flags) {
     return NULL;
 }
 
-const SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) {
+SkBlitRow::Proc32 SkBlitRow::PlatformProcs32(unsigned flags) {
     return NULL;
 }