From 54c5e965fe8f9a53a78834028fd65c792493da2b Mon Sep 17 00:00:00 2001 From: christian linke Date: Mon, 17 Dec 2012 16:15:11 +0100 Subject: * added new interfaces & nsm support + nsm tests + fixed some unit tests + fixed rundown Signed-off-by: christian linke --- googleMock/CMakeLists.txt | 2 ++ googleMock/include/gmock/gmock-matchers.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'googleMock') diff --git a/googleMock/CMakeLists.txt b/googleMock/CMakeLists.txt index 061c2fc..2db2f96 100644 --- a/googleMock/CMakeLists.txt +++ b/googleMock/CMakeLists.txt @@ -7,6 +7,8 @@ # BUILD_SHARED_LIBS is a standard CMake variable, but we declare it here to # make it prominent in the GUI. +set (CMAKE_CXX_FLAGS "-std=gnu++0x -D_GNU_SOURCE -Wno-variadic-macros") + option(BUILD_SHARED_LIBS "Build shared libraries (DLLs)." OFF) # Forces BUILD_SHARED_LIBS to OFF as Google Mock currently does not support diff --git a/googleMock/include/gmock/gmock-matchers.h b/googleMock/include/gmock/gmock-matchers.h index c21fa51..a6e0488 100644 --- a/googleMock/include/gmock/gmock-matchers.h +++ b/googleMock/include/gmock/gmock-matchers.h @@ -370,7 +370,7 @@ class PolymorphicMatcher { template inline Matcher MakeMatcher(const MatcherInterface* impl) { return Matcher(impl); -}; +} // Creates a polymorphic matcher from its implementation. This is // easier to use than the PolymorphicMatcher constructor as it -- cgit v1.2.1