summaryrefslogtreecommitdiffstats
path: root/googletest/include/gtest
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2020-02-27 19:02:17 (GMT)
committerCJ Johnson <johnsoncj@google.com>2020-02-28 21:41:09 (GMT)
commite588eb1ff9ff6598666279b737b27f983156ad85 (patch)
tree87fb82caa6a50608a601855e0a79a268c97cecbe /googletest/include/gtest
parent909b1ccfcacc9d6f920aa79e3f643c1a4e806eb2 (diff)
downloadgoogletest-master.zip
googletest-master.tar.gz
googletest-master.tar.bz2
Googletest exportHEADmaster
Rename internal color enumerators to avoid conflicts with curses.h macro definitions. Fixes #2685 PiperOrigin-RevId: 297639382
Diffstat (limited to 'googletest/include/gtest')
-rw-r--r--googletest/include/gtest/gtest.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h
index 39cff08..8871207 100644
--- a/googletest/include/gtest/gtest.h
+++ b/googletest/include/gtest/gtest.h
@@ -1807,7 +1807,7 @@ class GTEST_API_ AssertHelper {
GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelper);
};
-enum GTestColor { COLOR_DEFAULT, COLOR_RED, COLOR_GREEN, COLOR_YELLOW };
+enum class GTestColor { kDefault, kRed, kGreen, kYellow };
GTEST_API_ GTEST_ATTRIBUTE_PRINTF_(2, 3) void ColoredPrintf(GTestColor color,
const char* fmt,