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
97ef1c70
Commit
97ef1c70
authored
Oct 24, 2011
by
vladlosev
Browse files
Changes to fix gtest-printers_test on VC++ 2010.
parent
c7c7961d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
1 deletion
+5
-1
test/gtest-printers_test.cc
test/gtest-printers_test.cc
+5
-1
No files found.
test/gtest-printers_test.cc
View file @
97ef1c70
...
@@ -197,6 +197,7 @@ using ::std::pair;
...
@@ -197,6 +197,7 @@ using ::std::pair;
using
::
std
::
set
;
using
::
std
::
set
;
using
::
std
::
vector
;
using
::
std
::
vector
;
using
::
testing
::
PrintToString
;
using
::
testing
::
PrintToString
;
using
::
testing
::
internal
::
ImplicitCast_
;
using
::
testing
::
internal
::
NativeArray
;
using
::
testing
::
internal
::
NativeArray
;
using
::
testing
::
internal
::
RE
;
using
::
testing
::
internal
::
RE
;
using
::
testing
::
internal
::
Strings
;
using
::
testing
::
internal
::
Strings
;
...
@@ -1002,9 +1003,12 @@ TEST(PrintTupleTest, VariousSizes) {
...
@@ -1002,9 +1003,12 @@ TEST(PrintTupleTest, VariousSizes) {
EXPECT_EQ
(
"(false, 2, 3, 4, true, 6, 7, true, 9)"
,
Print
(
t9
));
EXPECT_EQ
(
"(false, 2, 3, 4, true, 6, 7, true, 9)"
,
Print
(
t9
));
const
char
*
const
str
=
"8"
;
const
char
*
const
str
=
"8"
;
// VC++ 2010's implementation of tuple of C++0x is deficient, requiring
// an explicit type cast of NULL to be used.
tuple
<
bool
,
char
,
short
,
testing
::
internal
::
Int32
,
// NOLINT
tuple
<
bool
,
char
,
short
,
testing
::
internal
::
Int32
,
// NOLINT
testing
::
internal
::
Int64
,
float
,
double
,
const
char
*
,
void
*
,
string
>
testing
::
internal
::
Int64
,
float
,
double
,
const
char
*
,
void
*
,
string
>
t10
(
false
,
'a'
,
3
,
4
,
5
,
1.5
F
,
-
2.5
,
str
,
NULL
,
"10"
);
t10
(
false
,
'a'
,
3
,
4
,
5
,
1.5
F
,
-
2.5
,
str
,
ImplicitCast_
<
void
*>
(
NULL
),
"10"
);
EXPECT_EQ
(
"(false, 'a' (97, 0x61), 3, 4, 5, 1.5, -2.5, "
+
PrintPointer
(
str
)
+
EXPECT_EQ
(
"(false, 'a' (97, 0x61), 3, 4, 5, 1.5, -2.5, "
+
PrintPointer
(
str
)
+
" pointing to
\"
8
\"
, NULL,
\"
10
\"
)"
,
" pointing to
\"
8
\"
, NULL,
\"
10
\"
)"
,
Print
(
t10
));
Print
(
t10
));
...
...
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