Merge pull request #2592 from kuzkry:remove-workaround_msvc-error-C2665
PiperOrigin-RevId: 284207090
This commit is contained in:
commit
9a976a74c9
|
@ -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) {
|
||||||
|
|
||||||
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;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user