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
a3097c82
Commit
a3097c82
authored
Dec 13, 2019
by
Matt Calabrese
Browse files
Merge pull request #2592 from kuzkry:remove-workaround_msvc-error-C2665
PiperOrigin-RevId: 284207090
parents
6251071a
a5136dbd
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
9 deletions
+0
-9
googlemock/test/gmock-generated-matchers_test.cc
googlemock/test/gmock-generated-matchers_test.cc
+0
-9
No files found.
googlemock/test/gmock-generated-matchers_test.cc
View file @
a3097c82
...
@@ -392,13 +392,6 @@ TEST(ElementsAreTest, AcceptsStringLiteral) {
...
@@ -392,13 +392,6 @@ TEST(ElementsAreTest, AcceptsStringLiteral) {
EXPECT_THAT
(
array
,
Not
(
ElementsAre
(
"hi"
,
"one"
,
"too"
)));
EXPECT_THAT
(
array
,
Not
(
ElementsAre
(
"hi"
,
"one"
,
"too"
)));
}
}
#ifndef _MSC_VER
// The following test passes a value of type const char[] to a
// function template that expects const T&. Some versions of MSVC
// generates a compiler error C2665 for that. We believe it's a bug
// in MSVC. Therefore this test is #if-ed out for MSVC.
// Declared here with the size unknown. Defined AFTER the following test.
// Declared here with the size unknown. Defined AFTER the following test.
extern
const
char
kHi
[];
extern
const
char
kHi
[];
...
@@ -415,8 +408,6 @@ TEST(ElementsAreTest, AcceptsArrayWithUnknownSize) {
...
@@ -415,8 +408,6 @@ TEST(ElementsAreTest, AcceptsArrayWithUnknownSize) {
const
char
kHi
[]
=
"hi"
;
const
char
kHi
[]
=
"hi"
;
#endif // _MSC_VER
TEST
(
ElementsAreTest
,
MakesCopyOfArguments
)
{
TEST
(
ElementsAreTest
,
MakesCopyOfArguments
)
{
int
x
=
1
;
int
x
=
1
;
int
y
=
2
;
int
y
=
2
;
...
...
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