Browse Source

Change strview.data() to string(strview) (porting to v1.32.x)

Donna Dionne 4 years ago
parent
commit
3481dc18f4
1 changed files with 3 additions and 2 deletions
  1. 3 2
      src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc

+ 3 - 2
src/core/ext/filters/client_channel/lb_policy/xds/xds_routing.cc

@@ -230,7 +230,7 @@ bool PathMatch(const absl::string_view& path,
     case XdsApi::Route::Matchers::PathMatcher::PathMatcherType::PATH:
       return path == path_matcher.string_matcher;
     case XdsApi::Route::Matchers::PathMatcher::PathMatcherType::REGEX:
-      return RE2::FullMatch(path.data(), *path_matcher.regex_matcher);
+      return RE2::FullMatch(std::string(path), *path_matcher.regex_matcher);
     default:
       return false;
   }
@@ -288,7 +288,8 @@ bool HeaderMatchHelper(
     case XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::EXACT:
       return value.value() == header_matcher.string_matcher;
     case XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::REGEX:
-      return RE2::FullMatch(value.value().data(), *header_matcher.regex_match);
+      return RE2::FullMatch(std::string(value.value()),
+                            *header_matcher.regex_match);
     case XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::RANGE:
       int64_t int_value;
       if (!absl::SimpleAtoi(value.value(), &int_value)) {