diff --git a/kythe/cxx/extractor/cxx_extractor.cc b/kythe/cxx/extractor/cxx_extractor.cc index 6fc545e312..684e43254e 100644 --- a/kythe/cxx/extractor/cxx_extractor.cc +++ b/kythe/cxx/extractor/cxx_extractor.cc @@ -21,6 +21,7 @@ #include #include +#include #include #include #include @@ -91,8 +92,8 @@ bool IsSpecialBufferName(llvm::StringRef id) { id == "" || id == ""; } -bool IsStdinPath(absl::string_view path) { - return path == "-" || path == "" || absl::StartsWith(path, "" || path.starts_with(" relative = cleaner->Relativize(path); + absl::StatusOr relative = + cleaner->Relativize({path.data(), path.size()}); if (!relative.ok()) { LOG(WARNING) << "Unable to relativize path:" << relative.status(); return std::string(path); @@ -137,9 +139,7 @@ std::string RelativizePath(absl::string_view path) { } // Returns a normalized path, removing the leading "./" if any. -std::string NormalizePath(absl::string_view path) { - return RelativizePath(path); -} +std::string NormalizePath(llvm::StringRef path) { return RelativizePath(path); } class RequiredRoots { public: