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
f1a87d73
Commit
f1a87d73
authored
Sep 23, 2017
by
Gennadiy Civil
Committed by
GitHub
Sep 23, 2017
Browse files
Merge pull request #1249 from stkhapugin/master
Make TypeWithoutFormatter compatible with Objective-C++ with ARC.
parents
bfc0ffc8
89f45180
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletion
+2
-1
googletest/include/gtest/gtest-printers.h
googletest/include/gtest/gtest-printers.h
+2
-1
No files found.
googletest/include/gtest/gtest-printers.h
View file @
f1a87d73
...
@@ -137,7 +137,8 @@ class TypeWithoutFormatter {
...
@@ -137,7 +137,8 @@ class TypeWithoutFormatter {
public:
public:
// This default version is called when kTypeKind is kOtherType.
// This default version is called when kTypeKind is kOtherType.
static
void
PrintValue
(
const
T
&
value
,
::
std
::
ostream
*
os
)
{
static
void
PrintValue
(
const
T
&
value
,
::
std
::
ostream
*
os
)
{
PrintBytesInObjectTo
(
reinterpret_cast
<
const
unsigned
char
*>
(
&
value
),
PrintBytesInObjectTo
(
static_cast
<
const
unsigned
char
*>
(
reinterpret_cast
<
const
void
*>
(
&
value
)),
sizeof
(
value
),
os
);
sizeof
(
value
),
os
);
}
}
};
};
...
...
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