Snap for 9710098 from a80bee481bda3af80ba044a5edce3506971abab8 to mainline-tzdata5-releaseaml_tz5_341510070aml_tz5_341510050aml_tz5_341510010aml_tz5_341510010

Change-Id: Ia073389f0ea6677f1478520c8e04b3c4eb9620f8

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();