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