diff options
| author | Krzysztof Kosiński <krzysio@google.com> | 2023-03-04 07:10:29 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-04 07:10:29 +0000 |
| commit | 8eddae67de93782e91c43748dc1b79aecceca052 (patch) | |
| tree | 7e56ce7c943781ef6d255e2264e55fe5b626bcc8 | |
| parent | fb5582f1897531a70a7f4bbde365d8e5593d6a43 (diff) | |
| parent | 59e0c195b17770768c12fffb87d5a0f2612175ab (diff) | |
| download | fmtlib-8eddae67de93782e91c43748dc1b79aecceca052.tar.gz | |
Remove deprecated GTest macro. am: 6205ebcc1d am: 59e0c195b1
Original change: https://android-review.googlesource.com/c/platform/external/fmtlib/+/2469727
Change-Id: I0383752e78485f131d6eb1293b44b3410b204022
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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(); |