Make SK_OVERRIDE expand to OVERRIDE on iOS

BUG=256595
R=reed@google.com

Author: glider@chromium.org

Review URL: https://chromiumcodereview.appspot.com/18531002

git-svn-id: http://skia.googlecode.com/svn/trunk@9883 2bbb7eff-a529-9590-31e7-b0007b416f81
This commit is contained in:
commit-bot@chromium.org 2013-07-03 08:39:46 +00:00
parent 98a196770c
commit e63c46c356

View File

@ -321,7 +321,7 @@
#ifndef SK_OVERRIDE
#if defined(_MSC_VER)
#define SK_OVERRIDE override
#elif defined(__clang__) && !defined(SK_BUILD_FOR_IOS)
#elif defined(__clang__)
// Clang defaults to C++03 and warns about using override. Squelch that. Intentionally no
// push/pop here so all users of SK_OVERRIDE ignore the warning too. This is like passing
// -Wno-c++11-extensions, except that GCC won't die (because it won't see this pragma).