Merge pull request #3421 from florin-crisan:bugfix/3420-dll-link-failure

PiperOrigin-RevId: 377367006
This commit is contained in:
Derek Mauro 2021-06-08 18:36:29 -04:00
commit 91e1bd6bfb
2 changed files with 4 additions and 4 deletions

View File

@ -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);
}

View File

@ -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);
};