ICU-11233 Remove U_FINAL for classes we subclass. Produces bad code.

X-SVN-Rev: 36346

diff --git a/icu4c/source/common/unicode/umachine.h b/icu4c/source/common/unicode/umachine.h
index dd37108bb346bcf446044d2e5025d75e5fbab29d..532159216a5e3d13027a7ffef6fc328c7b6f64b9 100644 (file)
--- a/icu4c/source/common/unicode/umachine.h
+++ b/icu4c/source/common/unicode/umachine.h
@@ -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
  */
 

diff --git a/icu4c/source/common/unicode/usetiter.h b/icu4c/source/common/unicode/usetiter.h
index 21c9babd0cf76d8a6d9b19bdd9cec3aee539813d..bf927b08cee86d0c1c8f99b88e8a8b81dd2f006d 100644 (file)
--- a/icu4c/source/common/unicode/usetiter.h
+++ b/icu4c/source/common/unicode/usetiter.h
@@ -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:
 

diff --git a/icu4c/source/i18n/unicode/tblcoll.h b/icu4c/source/i18n/unicode/tblcoll.h
index 878c1605af767c168365cf77f00984c8caef694e..64f092c63f2be0cf37c05b17f457775ae76e967b 100644 (file)
--- a/icu4c/source/i18n/unicode/tblcoll.h
+++ b/icu4c/source/i18n/unicode/tblcoll.h
@@ -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

diff --git a/icu4c/source/test/intltest/regcoll.cpp b/icu4c/source/test/intltest/regcoll.cpp
index f3b583bd839f74213f588628b005469cf959902e..0cc127e704a81ee38a0d16906e2f912e0f7a6777 100644 (file)
--- a/icu4c/source/test/intltest/regcoll.cpp
+++ b/icu4c/source/test/intltest/regcoll.cpp
@@ -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

diff --git a/icu4c/source/test/intltest/transrt.cpp b/icu4c/source/test/intltest/transrt.cpp
index 3f1d57b0310da6cc532c4e5dc9e02ae7e17cb6d7..66336ad754f164acc49877929ba00ff8c8a7da28 100644 (file)
--- a/icu4c/source/test/intltest/transrt.cpp
+++ b/icu4c/source/test/intltest/transrt.cpp
@@ -8,10 +8,6 @@
 **********************************************************************
 */
 
-// AbbreviatedUnicodeSetIterator overrides UnicodeSetIterator.
-#define U_FINAL
-#define U_OVERRIDE
-
 #include "unicode/utypes.h"
 
 #if !UCONFIG_NO_TRANSLITERATION