duration: adjust for C++20 char8_t type

C++20 makes string literals defined with u8"blah" return a new char8_t type, which is sensible but noisy here. Adjust for it by dropping an unneeded u8 in one place, and adding a cast in another. Message-Id: <[email protected]>
sarvex · May 12, 2020 · 07061f9 · 07061f9
1 parent 89ea879
commit 07061f9
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/duration.cc b/duration.cc
@@ -273,7 +273,7 @@ std::optional<cql_duration> parse_duration_standard_format(std::string_view s) {
     //
 
     static const auto pattern =
-            std::regex(u8"(\\d+)(y|Y|mo|MO|mO|Mo|w|W|d|D|h|H|s|S|ms|MS|mS|Ms|us|US|uS|Us|µs|µS|ns|NS|nS|Ns|m|M)");
+            std::regex("(\\d+)(y|Y|mo|MO|mO|Mo|w|W|d|D|h|H|s|S|ms|MS|mS|Ms|us|US|uS|Us|µs|µS|ns|NS|nS|Ns|m|M)");
 
     auto iter = s.cbegin();
     std::cmatch match;
@@ -291,7 +291,7 @@ std::optional<cql_duration> parse_duration_standard_format(std::string_view s) {
             auto view = std::string_view(symbol);
             view.remove_suffix(1);
 
-            if (view == u8"µ") {
+            if (view == reinterpret_cast<const char*>(u8"µ")) {
                 b.add_parsed_count(match, 1, microsecond);
                 continue;
             }