瀏覽代碼

Merge pull request #25344 from donnadionne/data_v1.33.x

Change strview.data() to string(strview) (porting to v1.33.x)
Srini Polavarapu 4 年之前
父節點
當前提交
79c0028f4c
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc

+ 3 - 2
src/core/ext/filters/client_channel/resolver/xds/xds_resolver.cc

@@ -329,7 +329,7 @@ bool PathMatch(const absl::string_view& path,
     case XdsApi::Route::Matchers::PathMatcher::PathMatcherType::PATH:
     case XdsApi::Route::Matchers::PathMatcher::PathMatcherType::PATH:
       return path == path_matcher.string_matcher;
       return path == path_matcher.string_matcher;
     case XdsApi::Route::Matchers::PathMatcher::PathMatcherType::REGEX:
     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:
     default:
       return false;
       return false;
   }
   }
@@ -389,7 +389,8 @@ bool HeaderMatchHelper(
     case XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::EXACT:
     case XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::EXACT:
       return value.value() == header_matcher.string_matcher;
       return value.value() == header_matcher.string_matcher;
     case XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::REGEX:
     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:
     case XdsApi::Route::Matchers::HeaderMatcher::HeaderMatcherType::RANGE:
       int64_t int_value;
       int64_t int_value;
       if (!absl::SimpleAtoi(value.value(), &int_value)) {
       if (!absl::SimpleAtoi(value.value(), &int_value)) {