diff options
| author | Matt Calabrese <calabrese@x.team> | 2019-12-13 12:57:26 -0500 |
|---|---|---|
| committer | Matt Calabrese <calabrese@x.team> | 2019-12-13 12:57:26 -0500 |
| commit | a3097c826e4d5aa3cce1e561f619dc652f5a9ced (patch) | |
| tree | 7b14dff1f9d6fedc7a40d1aa80f07d5855bf3cae /googlemock/test | |
| parent | 6251071a20e8ebfe9310b736baf55897853adba0 (diff) | |
| parent | a5136dbdd21eab0a3376c7dcd334607d2f3d6bd5 (diff) | |
| download | googletest-a3097c826e4d5aa3cce1e561f619dc652f5a9ced.tar.gz googletest-a3097c826e4d5aa3cce1e561f619dc652f5a9ced.tar.bz2 googletest-a3097c826e4d5aa3cce1e561f619dc652f5a9ced.zip | |
Merge pull request #2592 from kuzkry:remove-workaround_msvc-error-C2665
PiperOrigin-RevId: 284207090
Diffstat (limited to 'googlemock/test')
| -rw-r--r-- | googlemock/test/gmock-generated-matchers_test.cc | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/googlemock/test/gmock-generated-matchers_test.cc b/googlemock/test/gmock-generated-matchers_test.cc index f3f49a68..6783f8f8 100644 --- a/googlemock/test/gmock-generated-matchers_test.cc +++ b/googlemock/test/gmock-generated-matchers_test.cc @@ -392,13 +392,6 @@ TEST(ElementsAreTest, AcceptsStringLiteral) { 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. extern const char kHi[]; @@ -415,8 +408,6 @@ TEST(ElementsAreTest, AcceptsArrayWithUnknownSize) { const char kHi[] = "hi"; -#endif // _MSC_VER - TEST(ElementsAreTest, MakesCopyOfArguments) { int x = 1; int y = 2; |