diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-16 11:17:46 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-16 11:17:46 -0400 |
| commit | 378de8f72a43d1916774370aafea30e424e6d148 (patch) | |
| tree | 88f6c265fe70a08e314f3e45a3b03e0576cccf60 | |
| parent | 3a8d744030e165dc7bebf70e4fbc44831059a79b (diff) | |
| parent | 077ee54cefd247656ac9a995e150e0d1ab9d0bf7 (diff) | |
| download | googletest-378de8f72a43d1916774370aafea30e424e6d148.tar.gz googletest-378de8f72a43d1916774370aafea30e424e6d148.tar.bz2 googletest-378de8f72a43d1916774370aafea30e424e6d148.zip | |
Merge branch 'master' into deprecate
| -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 3afed86a..99268b31 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 |