ICU-22843 Simplify UTF-16 string literals.

FrankYFTang · Sep 10, 2024 · 7cad791 · 7cad791
1 parent 937f4ad
commit 7cad791
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 14 deletions.
diff --git a/icu4c/source/common/uniset_props.cpp b/icu4c/source/common/uniset_props.cpp
@@ -18,8 +18,6 @@
 *   Character property dependent functions moved here from uniset.cpp
 */
 
-#include <string_view>
-
 #include "unicode/utypes.h"
 #include "unicode/uniset.h"
 #include "unicode/parsepos.h"
@@ -47,10 +45,6 @@
 #include "uassert.h"
 #include "hash.h"
 
-// Makes u"literal"sv std::u16string_view literals possible.
-// https://en.cppreference.com/w/cpp/string/basic_string_view/operator%22%22sv
-using namespace std::string_view_literals;
-
 U_NAMESPACE_USE
 
 namespace {
@@ -61,7 +55,7 @@ constexpr char ASCII[] = "ASCII"; // [\u0000-\u007F]
 constexpr char ASSIGNED[] = "Assigned"; // [:^Cn:]
 
 // Unicode name property alias
-constexpr std::u16string_view NAME_PROP(u"na"sv);
+constexpr char16_t NAME_PROP[] = u"na";
 
 }  // namespace
 
@@ -92,7 +86,7 @@ namespace {
 // Cache some sets for other services -------------------------------------- ***
 void U_CALLCONV createUni32Set(UErrorCode &errorCode) {
     U_ASSERT(uni32Singleton == nullptr);
-    uni32Singleton = new UnicodeSet(UnicodeString(u"[:age=3.2:]"sv), errorCode);
+    uni32Singleton = new UnicodeSet(UnicodeString(u"[:age=3.2:]"), errorCode);
     if(uni32Singleton==nullptr) {
         errorCode=U_MEMORY_ALLOCATION_ERROR;
     } else {

diff --git a/icu4c/source/i18n/number_decimalquantity.cpp b/icu4c/source/i18n/number_decimalquantity.cpp
@@ -8,7 +8,6 @@
 #include <cstdlib>
 #include <cmath>
 #include <limits>
-#include <string_view>
 #include <stdlib.h>
 
 #include "unicode/plurrule.h"
@@ -23,10 +22,6 @@
 #include "uassert.h"
 #include "util.h"
 
-// Makes u"literal"sv std::u16string_view literals possible.
-// https://en.cppreference.com/w/cpp/string/basic_string_view/operator%22%22sv
-using namespace std::string_view_literals;
-
 using namespace icu;
 using namespace icu::number;
 using namespace icu::number::impl;
@@ -1087,7 +1082,7 @@ UnicodeString DecimalQuantity::toScientificString() const {
     result.append(u'E');
     int32_t _scale = upperPos + scale + exponent;
     if (_scale == INT32_MIN) {
-        result.append(u"-2147483648"sv);
+        result.append(u"-2147483648");
         return result;
     } else if (_scale < 0) {
         _scale *= -1;