diff options
author | Krzysztof KosiĆski <krzysio@google.com> | 2023-03-04 08:28:43 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-03-04 08:28:43 +0000 |
commit | 75cbc736e0160e1a6b3d841c18e7a65938a7347c (patch) | |
tree | 7e56ce7c943781ef6d255e2264e55fe5b626bcc8 | |
parent | ede283a2477c6a7d8a781c0967e95f84d173bb76 (diff) | |
parent | c92def5d5b03dcdbbccbea6d74f99e7a25f707eb (diff) | |
download | fmtlib-android14-qpr1-release.tar.gz |
Remove deprecated GTest macro. am: 6205ebcc1d am: 59e0c195b1 am: 8eddae67de am: c92def5d5bandroid-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-release
Original change: https://android-review.googlesource.com/c/platform/external/fmtlib/+/2469727
Change-Id: If57887e7ed24546cf36f2cb9a46b829719c1968a
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(); |