Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
aa34ae25
Commit
aa34ae25
authored
Dec 03, 2013
by
kosak
Browse files
Delete whitespace, and change the return type of ImplicitlyConvertible::MakeFrom() to From&.
parent
2d3543f8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
1 addition
and
3 deletions
+1
-3
include/gtest/internal/gtest-internal.h
include/gtest/internal/gtest-internal.h
+1
-1
test/gtest-printers_test.cc
test/gtest-printers_test.cc
+0
-2
No files found.
include/gtest/internal/gtest-internal.h
View file @
aa34ae25
...
...
@@ -784,7 +784,7 @@ class ImplicitlyConvertible {
// MakeFrom() is an expression whose type is From. We cannot simply
// use From(), as the type From may not have a public default
// constructor.
static
From
MakeFrom
();
static
typename
AddReference
<
From
>::
type
MakeFrom
();
// These two functions are overloaded. Given an expression
// Helper(x), the compiler will pick the first version if x can be
...
...
test/gtest-printers_test.cc
View file @
aa34ae25
...
...
@@ -414,8 +414,6 @@ TEST(PrintCStringTest, EscapesProperly) {
Print
(
p
));
}
// MSVC compiler can be configured to define whar_t as a typedef
// of unsigned short. Defining an overload for const wchar_t* in that case
// would cause pointers to unsigned shorts be printed as wide strings,
...
...
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