commit 73fbe7d97129e68db4914df2fd8cbcaff3aaf7c8
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sun Mar 05 00:07:27 2023 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sun Mar 05 00:07:27 2023 +0000
tree 7e56ce7c943781ef6d255e2264e55fe5b626bcc8
parent d6c83e7418fa1833fbb3785dc6e26365ce2c2914
parent c92def5d5b03dcdbbccbea6d74f99e7a25f707eb

Snap for 9690662 from c92def5d5b03dcdbbccbea6d74f99e7a25f707eb to udc-release

Change-Id: I0b249e117280351bbd5d7d98084f3dc88a78c01d

test/gtest-extra.h

diff --git a/test/gtest-extra.h b/test/gtest-extra.h
index 01c70dd..949ff50 100644
--- a/test/gtest-extra.h
+++ b/test/gtest-extra.h
@@ -67,8 +67,6 @@
   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 @@
   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();