Chromium Code Reviews Chromium Code Reviews
Issue 22288002:
Add a default value for SK_OVERRIDE in SkPostConfig.h (Closed)
Base URL: https://skia.googlecode.com/svn/trunk| 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 328 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 339 | 339 |
| 340 #if __has_feature(cxx_override_control) | 340 #if __has_feature(cxx_override_control) |
| 341 // Some documentation suggests we should be using __attribute__((ove rride)), | 341 // Some documentation suggests we should be using __attribute__((ove rride)), |
| 342 // but it doesn't work. | 342 // but it doesn't work. |
| 343 #define SK_OVERRIDE override | 343 #define SK_OVERRIDE override |
| 344 #elif defined(__has_extension) | 344 #elif defined(__has_extension) |
| 345 #if __has_extension(cxx_override_control) | 345 #if __has_extension(cxx_override_control) |
| 346 #define SK_OVERRIDE override | 346 #define SK_OVERRIDE override |
| 347 #endif | 347 #endif |
| 348 #endif | 348 #endif |
| 349 #else | 349 #endif |
| 350 // Linux GCC ignores "__attribute__((override))" and rejects "override". | 350 #ifndef SK_OVERRIDE |
| 351 #define SK_OVERRIDE | 351 » #define SK_OVERRIDE |
|
bungeman-skia
2013/08/06 17:33:09
Oh noes, a tab!
| |
| 352 #endif | 352 #endif |
| 353 #endif | 353 #endif |
| 354 | 354 |
| 355 ////////////////////////////////////////////////////////////////////// | 355 ////////////////////////////////////////////////////////////////////// |
| 356 | 356 |
| 357 #ifndef SK_PRINTF_LIKE | 357 #ifndef SK_PRINTF_LIKE |
| 358 #if defined(__clang__) || defined(__GNUC__) | 358 #if defined(__clang__) || defined(__GNUC__) |
| 359 #define SK_PRINTF_LIKE(A, B) __attribute__((format(printf, (A), (B)))) | 359 #define SK_PRINTF_LIKE(A, B) __attribute__((format(printf, (A), (B)))) |
| 360 #else | 360 #else |
| 361 #define SK_PRINTF_LIKE(A, B) | 361 #define SK_PRINTF_LIKE(A, B) |
| 362 #endif | 362 #endif |
| 363 #endif | 363 #endif |
| 364 | 364 |
| 365 ////////////////////////////////////////////////////////////////////// | 365 ////////////////////////////////////////////////////////////////////// |
| 366 | 366 |
| 367 #ifndef SK_SIZE_T_SPECIFIER | 367 #ifndef SK_SIZE_T_SPECIFIER |
| 368 #if defined(_MSC_VER) | 368 #if defined(_MSC_VER) |
| 369 #define SK_SIZE_T_SPECIFIER "%Iu" | 369 #define SK_SIZE_T_SPECIFIER "%Iu" |
| 370 #else | 370 #else |
| 371 #define SK_SIZE_T_SPECIFIER "%zu" | 371 #define SK_SIZE_T_SPECIFIER "%zu" |
| 372 #endif | 372 #endif |
| 373 #endif | 373 #endif |
| 374 | 374 |
| 375 ////////////////////////////////////////////////////////////////////// | 375 ////////////////////////////////////////////////////////////////////// |
| 376 | 376 |
| 377 #ifndef SK_ALLOW_STATIC_GLOBAL_INITIALIZERS | 377 #ifndef SK_ALLOW_STATIC_GLOBAL_INITIALIZERS |
| 378 #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1 | 378 #define SK_ALLOW_STATIC_GLOBAL_INITIALIZERS 1 |
| 379 #endif | 379 #endif |
| OLD | NEW |
