Skip to content

Commit

Permalink
Merge pull request #1655 from AdrianMoranMontes/master
Browse files Browse the repository at this point in the history
Fix issue #1654.
  • Loading branch information
gennadiycivil committed Jul 16, 2018
2 parents b4d4438 + ee3885f commit 077ee54
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions googlemock/test/gmock_ex_test.cc
Expand Up @@ -34,6 +34,7 @@
#include "gmock/gmock.h"
#include "gtest/gtest.h"

#if GTEST_HAS_EXCEPTIONS
namespace {

using testing::HasSubstr;
Expand All @@ -52,7 +53,6 @@ class MockFoo {
MOCK_METHOD0(GetNonDefaultConstructible, NonDefaultConstructible());
};

#if GTEST_HAS_EXCEPTIONS

TEST(DefaultValueTest, ThrowsRuntimeErrorWhenNoDefaultValue) {
MockFoo mock;
Expand All @@ -76,6 +76,5 @@ TEST(DefaultValueTest, ThrowsRuntimeErrorWhenNoDefaultValue) {
}
}

#endif

} // unnamed namespace
#endif

0 comments on commit 077ee54

Please sign in to comment.