diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-16 15:17:00 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-16 15:17:00 (GMT) |
| commit | 077ee54cefd247656ac9a995e150e0d1ab9d0bf7 (patch) | |
| tree | e5f0d40d7fed9a9a1a6e655259f63047ec4e1b55 | |
| parent | b4d4438df9479675a632b2f11125e57133822ece (diff) | |
| parent | ee3885fbd6ef79a9297b6aadda784711d77e15f7 (diff) | |
| download | googletest-077ee54cefd247656ac9a995e150e0d1ab9d0bf7.zip googletest-077ee54cefd247656ac9a995e150e0d1ab9d0bf7.tar.gz googletest-077ee54cefd247656ac9a995e150e0d1ab9d0bf7.tar.bz2 | |
Merge pull request #1655 from AdrianMoranMontes/master
Fix issue #1654.
| -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 |