aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorKrystian Kuzniarek <krystian.kuzniarek@gmail.com>2019-11-14 11:44:42 +0100
committerKrystian Kuzniarek <krystian.kuzniarek@gmail.com>2019-11-22 17:12:11 +0100
commita5136dbdd21eab0a3376c7dcd334607d2f3d6bd5 (patch)
tree53ae7767984d1adbdf0c50ce7556ac7634183c0f /googlemock
parentf9665846e405664bec650d77f9dd236c61a293b0 (diff)
downloadgoogletest-a5136dbdd21eab0a3376c7dcd334607d2f3d6bd5.tar.gz
googletest-a5136dbdd21eab0a3376c7dcd334607d2f3d6bd5.tar.bz2
googletest-a5136dbdd21eab0a3376c7dcd334607d2f3d6bd5.zip
remove MSVC workaround: error C2665
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/test/gmock-generated-matchers_test.cc9
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;