From: Andy Heninger <andy.heninger@gmail.com>
Date: Fri, 26 Feb 2016 21:37:06 +0000 (+0000)
Subject: ICU-12139 revert bad change to cstr.cpp. It is intended to use and depend on conversi... 
X-Git-Tag: milestone-59-0-1~637
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2cf8965496140a8ba96f71f4fdba6cbce6ca84a0;p=icu

ICU-12139 revert bad change to cstr.cpp. It is intended to use and depend on conversion. It is only intended for use from test and debug code, so the dependency is ok. It must be able to handle non-invariant characters.

X-SVN-Rev: 38386
---

diff --git a/icu4c/source/common/cstr.cpp b/icu4c/source/common/cstr.cpp
index 0c96f79c0d6..c30719361ea 100644
--- a/icu4c/source/common/cstr.cpp
+++ b/icu4c/source/common/cstr.cpp
@@ -15,11 +15,11 @@ U_NAMESPACE_BEGIN
 
 CStr::CStr(const UnicodeString &in) {
     UErrorCode status = U_ZERO_ERROR;
-    int32_t length = in.extract(0, in.length(), NULL, (uint32_t)0, US_INV);
+    int32_t length = in.extract(0, in.length(), NULL, (uint32_t)0);
     int32_t resultCapacity = 0;
     char *buf = s.getAppendBuffer(length, length, resultCapacity, status);
     if (U_SUCCESS(status)) {
-        in.extract(0, in.length(), buf, resultCapacity, US_INV);
+        in.extract(0, in.length(), buf, resultCapacity);
         s.append(buf, length, status);
     }
 }