diff options
| author | Abseil Team <absl-team@google.com> | 2020-02-27 14:02:17 -0500 |
|---|---|---|
| committer | CJ Johnson <johnsoncj@google.com> | 2020-02-28 16:41:09 -0500 |
| commit | e588eb1ff9ff6598666279b737b27f983156ad85 (patch) | |
| tree | 87fb82caa6a50608a601855e0a79a268c97cecbe /googletest/include | |
| parent | 909b1ccfcacc9d6f920aa79e3f643c1a4e806eb2 (diff) | |
| download | googletest-e588eb1ff9ff6598666279b737b27f983156ad85.tar.gz googletest-e588eb1ff9ff6598666279b737b27f983156ad85.tar.bz2 googletest-e588eb1ff9ff6598666279b737b27f983156ad85.zip | |
Googletest export
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 39cff08d..88712076 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, |