Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(28)

Side by Side Diff: core/SkPostConfig.h

Issue 18531002: Make SK_OVERRIDE expand to OVERRIDE on iOS (Closed) Base URL: http://skia.googlecode.com/svn/trunk/include/
Patch Set: Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 1
2 /* 2 /*
3 * Copyright 2006 The Android Open Source Project 3 * Copyright 2006 The Android Open Source Project
4 * 4 *
5 * Use of this source code is governed by a BSD-style license that can be 5 * Use of this source code is governed by a BSD-style license that can be
6 * found in the LICENSE file. 6 * found in the LICENSE file.
7 */ 7 */
8 8
9 9
10 #ifndef SkPostConfig_DEFINED 10 #ifndef SkPostConfig_DEFINED
(...skipping 303 matching lines...) Expand 10 before | Expand all | Expand 10 after
314 314
315 #endif 315 #endif
316 316
317 #endif 317 #endif
318 318
319 ////////////////////////////////////////////////////////////////////// 319 //////////////////////////////////////////////////////////////////////
320 320
321 #ifndef SK_OVERRIDE 321 #ifndef SK_OVERRIDE
322 #if defined(_MSC_VER) 322 #if defined(_MSC_VER)
323 #define SK_OVERRIDE override 323 #define SK_OVERRIDE override
324 #elif defined(__clang__) && !defined(SK_BUILD_FOR_IOS) 324 #elif defined(__clang__)
325 // Clang defaults to C++03 and warns about using override. Squelch that. Intentionally no 325 // Clang defaults to C++03 and warns about using override. Squelch that. Intentionally no
326 // push/pop here so all users of SK_OVERRIDE ignore the warning too. Thi s is like passing 326 // push/pop here so all users of SK_OVERRIDE ignore the warning too. Thi s is like passing
327 // -Wno-c++11-extensions, except that GCC won't die (because it won't se e this pragma). 327 // -Wno-c++11-extensions, except that GCC won't die (because it won't se e this pragma).
328 #pragma clang diagnostic ignored "-Wc++11-extensions" 328 #pragma clang diagnostic ignored "-Wc++11-extensions"
329 329
330 #if __has_feature(cxx_override_control) 330 #if __has_feature(cxx_override_control)
331 // Some documentation suggests we should be using __attribute__((ove rride)), 331 // Some documentation suggests we should be using __attribute__((ove rride)),
332 // but it doesn't work. 332 // but it doesn't work.
333 #define SK_OVERRIDE override 333 #define SK_OVERRIDE override
334 #elif defined(__has_extension) 334 #elif defined(__has_extension)
(...skipping 25 matching lines...) Expand all
360 #else 360 #else
361 #define SK_SIZE_T_SPECIFIER "%zu" 361 #define SK_SIZE_T_SPECIFIER "%zu"
362 #endif 362 #endif
363 #endif 363 #endif
364 364
365 ////////////////////////////////////////////////////////////////////// 365 //////////////////////////////////////////////////////////////////////
366 366
367 #ifndef SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 367 #ifndef SK_ALLOW_STATIC_GLOBAL_INITIALIZERS
368 #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1 368 #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1
369 #endif 369 #endif
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698