diff options
| author | Abseil Team <absl-team@google.com> | 2020-02-27 19:02:17 (GMT) |
|---|---|---|
| committer | CJ Johnson <johnsoncj@google.com> | 2020-02-28 21:08:31 (GMT) |
| commit | 7f56ae0f08ca5acf11149325909f5b8da06ed153 (patch) | |
| tree | 87fb82caa6a50608a601855e0a79a268c97cecbe /googletest/include | |
| parent | 75feebda2fc1be30af1020341d7fba20b52086dc (diff) | |
| download | googletest-7f56ae0f08ca5acf11149325909f5b8da06ed153.zip googletest-7f56ae0f08ca5acf11149325909f5b8da06ed153.tar.gz googletest-7f56ae0f08ca5acf11149325909f5b8da06ed153.tar.bz2 | |
Export Test - Do Not Mergerefs/pull/2734/head498B35FA518A5E1CF8C95CE6D51091B2
Rename internal color enumerators to avoid conflicts with curses.h macro definitions.
Fixes #2685
PiperOrigin-RevId: 297639382
Diffstat (limited to 'googletest/include')
| -rw-r--r-- | googletest/include/gtest/gtest.h | 2 |
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, |