commit 0c68c865f3dafa73ceaacc10dbc3ac09a78971b3
author misterg <misterg@google.com> Thu Apr 18 15:33:56 2019 -0400
committer Gennadiy Civil <misterg@google.com> Thu Apr 18 15:46:04 2019 -0400
tree 3b41bceca80d5b16795b1fc6811fde7cbaa8ed9f
parent 9f4f27b2a5081830aa977c4fbf303751118a68e4

Googletest export

Fixes https://github.com/google/googletest/issues/2232

PiperOrigin-RevId: 244237560

googletest/src/gtest.cc

diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
index 36210c6..5998f9a 100644
--- a/googletest/src/gtest.cc
+++ b/googletest/src/gtest.cc
@@ -5236,8 +5236,8 @@
   // when we are inside the subprocess of a death test.
   const int repeat = in_subprocess_for_death_test ? 1 : GTEST_FLAG(repeat);
   // Repeats forever if the repeat count is negative.
-  const bool forever = repeat < 0;
-  for (int i = 0; forever || i != repeat; i++) {
+  const bool gtest_repeat_forever = repeat < 0;
+  for (int i = 0; gtest_repeat_forever || i != repeat; i++) {
     // We want to preserve failures generated by ad-hoc test
     // assertions executed before RUN_ALL_TESTS().
     ClearNonAdHocTestResult();