commit ee3885fbd6ef79a9297b6aadda784711d77e15f7
author Adrian Moran <40658623+AdrianMoranMontes@users.noreply.github.com> Fri Jul 13 12:07:00 2018 +0200
committer GitHub <noreply@github.com> Fri Jul 13 12:07:00 2018 +0200
tree e5f0d40d7fed9a9a1a6e655259f63047ec4e1b55
parent cbd07191f4b7a3498fd0d1d7c58c4c39cccb8fb8
parent b4d4438df9479675a632b2f11125e57133822ece

Merge branch 'master' into master

googlemock/test/gmock_ex_test.cc

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 @@
   MOCK_METHOD0(GetNonDefaultConstructible, NonDefaultConstructible());
 };
 
-#if GTEST_HAS_EXCEPTIONS
 
 TEST(DefaultValueTest, ThrowsRuntimeErrorWhenNoDefaultValue) {
   MockFoo mock;
@@ -76,6 +76,5 @@
   }
 }
 
-#endif
-
 }  // unnamed namespace
+#endif