OLD | NEW |
1 /* | 1 /* |
2 ****************************************************************************** | 2 ****************************************************************************** |
3 * | 3 * |
4 * Copyright (C) 1999-2014, International Business Machines | 4 * Copyright (C) 1999-2015, International Business Machines |
5 * Corporation and others. All Rights Reserved. | 5 * Corporation and others. All Rights Reserved. |
6 * | 6 * |
7 ****************************************************************************** | 7 ****************************************************************************** |
8 * file name: umachine.h | 8 * file name: umachine.h |
9 * encoding: US-ASCII | 9 * encoding: US-ASCII |
10 * tab size: 8 (not used) | 10 * tab size: 8 (not used) |
11 * indentation:4 | 11 * indentation:4 |
12 * | 12 * |
13 * created on: 1999sep13 | 13 * created on: 1999sep13 |
14 * created by: Markus W. Scherer | 14 * created by: Markus W. Scherer |
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
125 */ | 125 */ |
126 | 126 |
127 /** | 127 /** |
128 * \def U_FINAL | 128 * \def U_FINAL |
129 * Defined to the C++11 "final" keyword if available. | 129 * Defined to the C++11 "final" keyword if available. |
130 * Denotes a class or member which may not be overridden in subclasses. | 130 * Denotes a class or member which may not be overridden in subclasses. |
131 * May result in an error if subclasses attempt to override. | 131 * May result in an error if subclasses attempt to override. |
132 * @internal | 132 * @internal |
133 */ | 133 */ |
134 | 134 |
135 #if defined(__cplusplus) && __cplusplus>=201103L | 135 #if U_CPLUSPLUS_VERSION >= 11 |
136 /* C++11 */ | 136 /* C++11 */ |
137 #ifndef U_OVERRIDE | 137 #ifndef U_OVERRIDE |
138 #define U_OVERRIDE override | 138 #define U_OVERRIDE override |
139 #endif | 139 #endif |
140 #ifndef U_FINAL | 140 #ifndef U_FINAL |
141 #define U_FINAL final | 141 #define U_FINAL final |
142 #endif | 142 #endif |
143 #else | 143 #else |
144 /* not C++11 - define to nothing */ | 144 /* not C++11 - define to nothing */ |
145 #ifndef U_OVERRIDE | 145 #ifndef U_OVERRIDE |
(...skipping 201 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
347 * | 347 * |
348 * @return -1 | 348 * @return -1 |
349 * @see UChar32 | 349 * @see UChar32 |
350 * @stable ICU 2.4 | 350 * @stable ICU 2.4 |
351 */ | 351 */ |
352 #define U_SENTINEL (-1) | 352 #define U_SENTINEL (-1) |
353 | 353 |
354 #include "unicode/urename.h" | 354 #include "unicode/urename.h" |
355 | 355 |
356 #endif | 356 #endif |
OLD | NEW |