diff options
author | Krzysztof Kosiński <krzysio@google.com> | 2023-03-03 23:55:55 +0000 |
---|---|---|
committer | Krzysztof Kosiński <krzysio@google.com> | 2023-03-03 23:55:55 +0000 |
commit | 6205ebcc1dd782e70805aabc36ac9863f4df7504 (patch) | |
tree | 7e56ce7c943781ef6d255e2264e55fe5b626bcc8 | |
parent | fb5582f1897531a70a7f4bbde365d8e5593d6a43 (diff) | |
download | fmtlib-6205ebcc1dd782e70805aabc36ac9863f4df7504.tar.gz |
Remove deprecated GTest macro.
GTEST_DISALLOW_COPY_AND_ASSIGN_ no longer exists in v1.13.0.
fmtlib v9.1.0 no longer contains this macro, but upgrading to
that version causes extensive breakage, so this is a spot fix
to unblock the googletest upgrade.
Bug: 271622675
Test: presubmit
Change-Id: I364a87cb02f9959640156b917a963f573e62ddf8
-rw-r--r-- | test/gtest-extra.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/test/gtest-extra.h b/test/gtest-extra.h index 01c70ddb..949ff50e 100644 --- a/test/gtest-extra.h +++ b/test/gtest-extra.h @@ -67,8 +67,6 @@ class OutputRedirect { fmt::file original_; // Original file passed to redirector. fmt::file read_end_; // Read end of the pipe where the output is redirected. - GTEST_DISALLOW_COPY_AND_ASSIGN_(OutputRedirect); - void flush(); void restore(); @@ -76,6 +74,9 @@ class OutputRedirect { explicit OutputRedirect(FILE* file); ~OutputRedirect() FMT_NOEXCEPT; + OutputRedirect(const OutputRedirect&) = delete; + OutputRedirect& operator=(const OutputRedirect&) = delete; + // Restores the original file, reads output from the pipe into a string // and returns it. std::string restore_and_read(); |