| OLD | NEW | 
|---|
| 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 304 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 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__) && !defined(SK_BUILD_FOR_IOS) | 
|  | 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 | 
|  | 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" | 
|  | 329 | 
| 325         #if __has_feature(cxx_override_control) | 330         #if __has_feature(cxx_override_control) | 
| 326             // Some documentation suggests we should be using __attribute__((ove
     rride)), | 331             // Some documentation suggests we should be using __attribute__((ove
     rride)), | 
| 327             // but it doesn't work. | 332             // but it doesn't work. | 
| 328             #define SK_OVERRIDE override | 333             #define SK_OVERRIDE override | 
| 329         #elif defined(__has_extension) | 334         #elif defined(__has_extension) | 
| 330             #if __has_extension(cxx_override_control) | 335             #if __has_extension(cxx_override_control) | 
| 331                 #define SK_OVERRIDE override | 336                 #define SK_OVERRIDE override | 
| 332             #endif | 337             #endif | 
| 333         #endif | 338         #endif | 
| 334     #else | 339     #else | 
| (...skipping 20 matching lines...) Expand all  Loading... | 
| 355 #else | 360 #else | 
| 356 #define SK_SIZE_T_SPECIFIER "%zu" | 361 #define SK_SIZE_T_SPECIFIER "%zu" | 
| 357 #endif | 362 #endif | 
| 358 #endif | 363 #endif | 
| 359 | 364 | 
| 360 ////////////////////////////////////////////////////////////////////// | 365 ////////////////////////////////////////////////////////////////////// | 
| 361 | 366 | 
| 362 #ifndef SK_ALLOW_STATIC_GLOBAL_INITIALIZERS | 367 #ifndef SK_ALLOW_STATIC_GLOBAL_INITIALIZERS | 
| 363 #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1 | 368 #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1 | 
| 364 #endif | 369 #endif | 
| OLD | NEW | 
|---|