From d515158d9c015349a79cbdac75a3dfbd0142baae Mon Sep 17 00:00:00 2001 From: Tom Lachecki Date: Thu, 13 Jun 2019 17:37:33 +0100 Subject: [PATCH 1/2] Fixed issue #2284 (Incompatibility with C++17) --- googlemock/test/gmock-matchers_test.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/googlemock/test/gmock-matchers_test.cc b/googlemock/test/gmock-matchers_test.cc index eb0a0506..89ad3359 100644 --- a/googlemock/test/gmock-matchers_test.cc +++ b/googlemock/test/gmock-matchers_test.cc @@ -4266,8 +4266,8 @@ TEST(ResultOfTest, WorksForFunctionReferences) { // Tests that ResultOf(f, ...) compiles and works as expected when f is a // function object. -struct Functor : public ::std::unary_function { - result_type operator()(argument_type input) const { +struct Functor { + std::string operator()(int input) const { return IntToStringFunction(input); } }; From f7c178ecb33c92763fa41d4999db30aaf43a6b30 Mon Sep 17 00:00:00 2001 From: Gennadiy Civil Date: Thu, 13 Jun 2019 17:16:43 -0400 Subject: [PATCH 2/2] Makefiles are no longer supported. Adding pseudo-break with their impending removal to make sure that people who are interested will notice --- googlemock/make/Makefile | 11 ++++++++++- googletest/make/Makefile | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/googlemock/make/Makefile b/googlemock/make/Makefile index 386293a0..fb1445a1 100644 --- a/googlemock/make/Makefile +++ b/googlemock/make/Makefile @@ -59,7 +59,16 @@ GMOCK_HEADERS = $(GMOCK_DIR)/include/gmock/*.h \ # House-keeping build targets. -all : $(GTEST_LIBS) $(TESTS) +ifndef GOOGLETEST_UNSUPPORTED_MAKEFILE_BUILD_SYSTEM_WORKAROUND +.PHONY all: + $(info "The Make buildsystem is no longer supported") + $(info "You can temporarily set GOOGLETEST_UNSUPPORTED_MAKEFILE_BUILD_SYSTEM_WORKAROUND=1") + $(info "i.e make GOOGLETEST_UNSUPPORTED_MAKEFILE_BUILD_SYSTEM_WORKAROUND=1 all") + $(info "But this is going away very soon. ") + $(exit 1) +else +all: $(GTEST_LIBS) $(TESTS) +endif clean : rm -f $(GTEST_LIBS) $(TESTS) *.o diff --git a/googletest/make/Makefile b/googletest/make/Makefile index b62da67a..3f2ffce2 100644 --- a/googletest/make/Makefile +++ b/googletest/make/Makefile @@ -44,7 +44,16 @@ GTEST_HEADERS = $(GTEST_DIR)/include/gtest/*.h \ # House-keeping build targets. -all : $(GTEST_LIBS) $(TESTS) +ifndef GOOGLETEST_UNSUPPORTED_MAKEFILE_BUILD_SYSTEM_WORKAROUND +.PHONY all: + $(info "The Make buildsystem is no longer supported") + $(info "You can temporarily set GOOGLETEST_UNSUPPORTED_MAKEFILE_BUILD_SYSTEM_WORKAROUND=1") + $(info "i.e make GOOGLETEST_UNSUPPORTED_MAKEFILE_BUILD_SYSTEM_WORKAROUND=1 all") + $(info "But this is going away very soon. ") + $(exit 1) +else +all: $(GTEST_LIBS) $(TESTS) +endif clean : rm -f $(GTEST_LIBS) $(TESTS) *.o