mirror of
https://github.com/unicode-org/icu.git
synced 2025-04-07 06:25:30 +00:00
ICU-11233 Remove U_FINAL for classes we subclass. Produces bad code.
X-SVN-Rev: 36346
This commit is contained in:
parent
0eb4b4682d
commit
f626431e29
5 changed files with 2 additions and 14 deletions
|
@ -121,8 +121,6 @@
|
|||
* Defined to the C++11 "override" keyword if available.
|
||||
* Denotes a class or member which is an override of the base class.
|
||||
* May result in an error if it applied to something not an override.
|
||||
* (NOTE: '#define U_OVERRIDE' at the top of a compilation unit will
|
||||
* disable this keyword's use.)
|
||||
* @internal
|
||||
*/
|
||||
|
||||
|
@ -131,8 +129,6 @@
|
|||
* Defined to the C++11 "final" keyword if available.
|
||||
* Denotes a class or member which may not be overridden in subclasses.
|
||||
* May result in an error if subclasses attempt to override.
|
||||
* (NOTE: '#define U_FINAL' at the top of a compilation unit will
|
||||
* disable this keyword's use.)
|
||||
* @internal
|
||||
*/
|
||||
|
||||
|
|
|
@ -58,7 +58,7 @@ class UnicodeString;
|
|||
* @author M. Davis
|
||||
* @stable ICU 2.4
|
||||
*/
|
||||
class U_COMMON_API UnicodeSetIterator U_FINAL : public UObject {
|
||||
class U_COMMON_API UnicodeSetIterator : public UObject {
|
||||
|
||||
protected:
|
||||
|
||||
|
|
|
@ -108,7 +108,7 @@ class UVector64;
|
|||
* Note, RuleBasedCollator is not to be subclassed.
|
||||
* @see Collator
|
||||
*/
|
||||
class U_I18N_API RuleBasedCollator U_FINAL : public Collator {
|
||||
class U_I18N_API RuleBasedCollator : public Collator {
|
||||
public:
|
||||
/**
|
||||
* RuleBasedCollator constructor. This takes the table rules and builds a
|
||||
|
|
|
@ -4,10 +4,6 @@
|
|||
* others. All Rights Reserved.
|
||||
********************************************************************/
|
||||
|
||||
// My4146160Collator overrides RBC. Disable U_FINAL for this test.
|
||||
#define U_FINAL
|
||||
#define U_OVERRIDE
|
||||
|
||||
#include "unicode/utypes.h"
|
||||
|
||||
#if !UCONFIG_NO_COLLATION
|
||||
|
|
|
@ -8,10 +8,6 @@
|
|||
**********************************************************************
|
||||
*/
|
||||
|
||||
// AbbreviatedUnicodeSetIterator overrides UnicodeSetIterator.
|
||||
#define U_FINAL
|
||||
#define U_OVERRIDE
|
||||
|
||||
#include "unicode/utypes.h"
|
||||
|
||||
#if !UCONFIG_NO_TRANSLITERATION
|
||||
|
|
Loading…
Add table
Reference in a new issue