ICU-9530 Remove extra casts that were added to sidestep problems with the clang compiler.

X-SVN-Rev: 32447

diff --git a/icu4c/source/common/unifilt.cpp b/icu4c/source/common/unifilt.cpp
index 5bf700839d84ca055dfe645cd331ae6c2fd5fccd..5e1a131f11d2be8cedca9c253c7539647efd6467 100644 (file)
--- a/icu4c/source/common/unifilt.cpp
+++ b/icu4c/source/common/unifilt.cpp
@@ -23,14 +23,11 @@ UnicodeMatcher::~UnicodeMatcher() {}
 UnicodeFilter::~UnicodeFilter() {}
 
 /**
- * UnicodeFunctor API.  Cast 'this' to a UnicodeMatcher* pointer
- * and return the pointer.
+ * UnicodeFunctor API.
+ *   Note that UnicodeMatcher is a base class of UnicodeFilter.
  */
 UnicodeMatcher* UnicodeFilter::toMatcher() const {
-  UnicodeFilter  *nonconst_this = const_cast<UnicodeFilter *>(this);
-  UnicodeMatcher *nonconst_base = static_cast<UnicodeMatcher *>(nonconst_this);
-  
-  return nonconst_base;
+  return const_cast<UnicodeFilter *>(this);
 }
 
 void UnicodeFilter::setData(const TransliterationRuleData*) {}

diff --git a/icu4c/source/i18n/strrepl.cpp b/icu4c/source/i18n/strrepl.cpp
index bf655cff75f0e557cb1aaebcf1f2b56f5983775c..4c90cfb32c059bed22cc9aa52677b28e9ce6fcef 100644 (file)
--- a/icu4c/source/i18n/strrepl.cpp
+++ b/icu4c/source/i18n/strrepl.cpp
@@ -93,10 +93,7 @@ UnicodeFunctor* StringReplacer::clone() const {
  * Implement UnicodeFunctor
  */
 UnicodeReplacer* StringReplacer::toReplacer() const {
-  StringReplacer  *nonconst_this = const_cast<StringReplacer *>(this);
-  UnicodeReplacer *nonconst_base = static_cast<UnicodeReplacer *>(nonconst_this);
-  
-  return nonconst_base;
+  return const_cast<StringReplacer *>(this);
 }
 
 /**