From 482ac6ee63429af2aa9c44f4e6427873fb68fb1f Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Tue, 17 Mar 2020 16:58:55 -0400 Subject: Googletest export Move internal function out of header because Hyrum's law always wins. PiperOrigin-RevId: 301446904 --- googletest/include/gtest/gtest.h | 6 ------ googletest/src/gtest.cc | 4 ++++ 2 files changed, 4 insertions(+), 6 deletions(-) (limited to 'googletest') diff --git a/googletest/include/gtest/gtest.h b/googletest/include/gtest/gtest.h index 88712076..0139fccf 100644 --- a/googletest/include/gtest/gtest.h +++ b/googletest/include/gtest/gtest.h @@ -1807,12 +1807,6 @@ class GTEST_API_ AssertHelper { GTEST_DISALLOW_COPY_AND_ASSIGN_(AssertHelper); }; -enum class GTestColor { kDefault, kRed, kGreen, kYellow }; - -GTEST_API_ GTEST_ATTRIBUTE_PRINTF_(2, 3) void ColoredPrintf(GTestColor color, - const char* fmt, - ...); - } // namespace internal // The pure interface class that all value-parameterized tests inherit from. diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc index 6911ad69..2eb2ecb8 100644 --- a/googletest/src/gtest.cc +++ b/googletest/src/gtest.cc @@ -3056,6 +3056,9 @@ static const char * TestPartResultTypeToString(TestPartResult::Type type) { } namespace internal { +namespace { +enum class GTestColor { kDefault, kRed, kGreen, kYellow }; +} // namespace // Prints a TestPartResult to an std::string. static std::string PrintTestPartResultToString( @@ -3194,6 +3197,7 @@ bool ShouldUseColor(bool stdout_is_tty) { // cannot simply emit special characters and have the terminal change colors. // This routine must actually emit the characters rather than return a string // that would be colored when printed, as can be done on Linux. + void ColoredPrintf(GTestColor color, const char* fmt, ...) { va_list args; va_start(args, fmt); -- cgit v1.2.3