Merge pull request #4502 from davidmatson:fixStreamHelpTextOs
PiperOrigin-RevId: 621172364
Change-Id: Ibaacb17c60b5ee0e58c3689b79aa2cd6b49dc1c4
diff --git a/googletest/include/gtest/internal/gtest-filepath.h b/googletest/include/gtest/internal/gtest-filepath.h
index 7ffb492..6dc47be 100644
--- a/googletest/include/gtest/internal/gtest-filepath.h
+++ b/googletest/include/gtest/internal/gtest-filepath.h
@@ -71,7 +71,7 @@
public:
FilePath() : pathname_("") {}
FilePath(const FilePath& rhs) : pathname_(rhs.pathname_) {}
- FilePath(FilePath&& rhs) : pathname_(std::move(rhs.pathname_)) {}
+ FilePath(FilePath&& rhs) noexcept : pathname_(std::move(rhs.pathname_)) {}
explicit FilePath(std::string pathname) : pathname_(std::move(pathname)) {
Normalize();
@@ -81,7 +81,7 @@
Set(rhs);
return *this;
}
- FilePath& operator=(FilePath&& rhs) {
+ FilePath& operator=(FilePath&& rhs) noexcept {
pathname_ = std::move(rhs.pathname_);
return *this;
}
diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 9c23011..b429050 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -379,7 +379,7 @@
testing::internal::StringFromGTestEnv("stream_result_to", ""),
"This flag specifies the host name and the port number on which to stream "
"test results. Example: \"localhost:555\". The flag is effective only on "
- "Linux and Mac.");
+ "Linux and macOS.");
GTEST_DEFINE_bool_(
throw_on_failure,
