diff options
author | Derek Mauro <dmauro@google.com> | 2021-06-08 22:36:29 (GMT) |
---|---|---|
committer | Derek Mauro <dmauro@google.com> | 2021-06-08 22:36:29 (GMT) |
commit | 91e1bd6bfb65757d063cb2c46bd5bfde1bd0d424 (patch) | |
tree | 6e8c5a1aa03ff993737839f3ea7f31a3e27226f3 /googletest/include | |
parent | 9d698f6905a1a06d6f1109ab1c1e2309b08de2ac (diff) | |
parent | 26a1569c72e85a77096cae6fbe95228a4ca765d6 (diff) | |
download | googletest-91e1bd6bfb65757d063cb2c46bd5bfde1bd0d424.zip googletest-91e1bd6bfb65757d063cb2c46bd5bfde1bd0d424.tar.gz googletest-91e1bd6bfb65757d063cb2c46bd5bfde1bd0d424.tar.bz2 |
Merge pull request #3421 from florin-crisan:bugfix/3420-dll-link-failure
PiperOrigin-RevId: 377367006
Diffstat (limited to 'googletest/include')
-rw-r--r-- | googletest/include/gtest/gtest-printers.h | 6 | ||||
-rw-r--r-- | googletest/include/gtest/internal/gtest-param-util.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/googletest/include/gtest/gtest-printers.h b/googletest/include/gtest/gtest-printers.h index 978420e..076c9de 100644 --- a/googletest/include/gtest/gtest-printers.h +++ b/googletest/include/gtest/gtest-printers.h @@ -501,18 +501,18 @@ inline void PrintTo(unsigned char* s, ::std::ostream* os) { } #ifdef __cpp_char8_t // Overloads for u8 strings. -void PrintTo(const char8_t* s, ::std::ostream* os); +GTEST_API_ void PrintTo(const char8_t* s, ::std::ostream* os); inline void PrintTo(char8_t* s, ::std::ostream* os) { PrintTo(ImplicitCast_<const char8_t*>(s), os); } #endif // Overloads for u16 strings. -void PrintTo(const char16_t* s, ::std::ostream* os); +GTEST_API_ void PrintTo(const char16_t* s, ::std::ostream* os); inline void PrintTo(char16_t* s, ::std::ostream* os) { PrintTo(ImplicitCast_<const char16_t*>(s), os); } // Overloads for u32 strings. -void PrintTo(const char32_t* s, ::std::ostream* os); +GTEST_API_ void PrintTo(const char32_t* s, ::std::ostream* os); inline void PrintTo(char32_t* s, ::std::ostream* os) { PrintTo(ImplicitCast_<const char32_t*>(s), os); } diff --git a/googletest/include/gtest/internal/gtest-param-util.h b/googletest/include/gtest/internal/gtest-param-util.h index ed5d467..c2ef6e3 100644 --- a/googletest/include/gtest/internal/gtest-param-util.h +++ b/googletest/include/gtest/internal/gtest-param-util.h @@ -478,7 +478,7 @@ class ParameterizedTestSuiteInfoBase { // // Report a the name of a test_suit as safe to ignore // as the side effect of construction of this type. -struct MarkAsIgnored { +struct GTEST_API_ MarkAsIgnored { explicit MarkAsIgnored(const char* test_suite); }; |