Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
91e1bd6b
Commit
91e1bd6b
authored
Jun 08, 2021
by
Derek Mauro
Browse files
Merge pull request #3421 from florin-crisan:bugfix/3420-dll-link-failure
PiperOrigin-RevId: 377367006
parents
9d698f69
26a1569c
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
4 deletions
+4
-4
googletest/include/gtest/gtest-printers.h
googletest/include/gtest/gtest-printers.h
+3
-3
googletest/include/gtest/internal/gtest-param-util.h
googletest/include/gtest/internal/gtest-param-util.h
+1
-1
No files found.
googletest/include/gtest/gtest-printers.h
View file @
91e1bd6b
...
...
@@ -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
);
}
...
...
googletest/include/gtest/internal/gtest-param-util.h
View file @
91e1bd6b
...
...
@@ -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
);
};
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment