diff options
| author | Masaru Tsuchiyama <m.tmatma@gmail.com> | 2018-07-17 23:03:49 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-17 23:03:49 (GMT) |
| commit | 234958def514c33d5598d1ba7d81ce6228fa21d2 (patch) | |
| tree | ee7bd1cb523355ddbbb7b351423541c9d6f73bb7 /googlemock | |
| parent | 4bcc9b9807b256e2a59daabb86156f8658031b68 (diff) | |
| parent | 077ee54cefd247656ac9a995e150e0d1ab9d0bf7 (diff) | |
| download | googletest-234958def514c33d5598d1ba7d81ce6228fa21d2.zip googletest-234958def514c33d5598d1ba7d81ce6228fa21d2.tar.gz googletest-234958def514c33d5598d1ba7d81ce6228fa21d2.tar.bz2 | |
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/test/gmock_ex_test.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/googlemock/test/gmock_ex_test.cc b/googlemock/test/gmock_ex_test.cc index 3afed86..99268b3 100644 --- a/googlemock/test/gmock_ex_test.cc +++ b/googlemock/test/gmock_ex_test.cc @@ -34,6 +34,7 @@ #include "gmock/gmock.h" #include "gtest/gtest.h" +#if GTEST_HAS_EXCEPTIONS namespace { using testing::HasSubstr; @@ -52,7 +53,6 @@ class MockFoo { MOCK_METHOD0(GetNonDefaultConstructible, NonDefaultConstructible()); }; -#if GTEST_HAS_EXCEPTIONS TEST(DefaultValueTest, ThrowsRuntimeErrorWhenNoDefaultValue) { MockFoo mock; @@ -76,6 +76,5 @@ TEST(DefaultValueTest, ThrowsRuntimeErrorWhenNoDefaultValue) { } } -#endif - } // unnamed namespace +#endif |