| OLD | NEW |
|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. | 2 * Copyright (C) 2011, 2012 Apple Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions | 5 * modification, are permitted provided that the following conditions |
| 6 * are met: | 6 * are met: |
| 7 * 1. Redistributions of source code must retain the above copyright | 7 * 1. Redistributions of source code must retain the above copyright |
| 8 * notice, this list of conditions and the following disclaimer. | 8 * notice, this list of conditions and the following disclaimer. |
| 9 * 2. Redistributions in binary form must reproduce the above copyright | 9 * 2. Redistributions in binary form must reproduce the above copyright |
| 10 * notice, this list of conditions and the following disclaimer in the | 10 * notice, this list of conditions and the following disclaimer in the |
| (...skipping 177 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 188 #else | 188 #else |
| 189 #define WARN_UNUSED_RETURN | 189 #define WARN_UNUSED_RETURN |
| 190 #endif | 190 #endif |
| 191 | 191 |
| 192 | 192 |
| 193 /* ALLOW_UNUSED_LOCAL */ | 193 /* ALLOW_UNUSED_LOCAL */ |
| 194 | 194 |
| 195 #define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0 | 195 #define ALLOW_UNUSED_LOCAL(x) false ? (void)x : (void)0 |
| 196 | 196 |
| 197 | 197 |
| 198 /* OVERRIDE and FINAL */ | |
| 199 | |
| 200 #if COMPILER_SUPPORTS(CXX_OVERRIDE_CONTROL) | |
| 201 #define OVERRIDE override | |
| 202 #define FINAL final | |
| 203 #else | |
| 204 #define OVERRIDE | |
| 205 #define FINAL | |
| 206 #endif | |
| 207 | |
| 208 | |
| 209 /* WTF_DELETED_FUNCTION */ | 198 /* WTF_DELETED_FUNCTION */ |
| 210 | 199 |
| 211 #if COMPILER_SUPPORTS(CXX_DELETED_FUNCTIONS) | 200 #if COMPILER_SUPPORTS(CXX_DELETED_FUNCTIONS) |
| 212 #define WTF_DELETED_FUNCTION = delete | 201 #define WTF_DELETED_FUNCTION = delete |
| 213 #else | 202 #else |
| 214 #define WTF_DELETED_FUNCTION | 203 #define WTF_DELETED_FUNCTION |
| 215 #endif | 204 #endif |
| 216 | 205 |
| 217 | 206 |
| 218 /* REFERENCED_FROM_ASM */ | 207 /* REFERENCED_FROM_ASM */ |
| (...skipping 24 matching lines...) Expand all Loading... |
| 243 #define WTF_COMPILER_SUPPORTS_PRETTY_FUNCTION 1 | 232 #define WTF_COMPILER_SUPPORTS_PRETTY_FUNCTION 1 |
| 244 #define WTF_PRETTY_FUNCTION __PRETTY_FUNCTION__ | 233 #define WTF_PRETTY_FUNCTION __PRETTY_FUNCTION__ |
| 245 #elif COMPILER(MSVC) | 234 #elif COMPILER(MSVC) |
| 246 #define WTF_COMPILER_SUPPORTS_PRETTY_FUNCTION 1 | 235 #define WTF_COMPILER_SUPPORTS_PRETTY_FUNCTION 1 |
| 247 #define WTF_PRETTY_FUNCTION __FUNCSIG__ | 236 #define WTF_PRETTY_FUNCTION __FUNCSIG__ |
| 248 #else | 237 #else |
| 249 #define WTF_PRETTY_FUNCTION __FUNCTION__ | 238 #define WTF_PRETTY_FUNCTION __FUNCTION__ |
| 250 #endif | 239 #endif |
| 251 | 240 |
| 252 #endif /* WTF_Compiler_h */ | 241 #endif /* WTF_Compiler_h */ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 650933002:
Remove OVERRIDE and FINAL macros. (Closed)
Base URL: svn://svn.chromium.org/blink/trunk