From 575537046819bb0f5201f7772208c049779d2c07 Mon Sep 17 00:00:00 2001 From: Jason Dillaman Date: Tue, 18 Aug 2015 13:42:45 -0400 Subject: [PATCH] gtest: enable use of TR1 tuples Since the TR1 tuple is already in use within the Ceph project, this flag needs to be enabled to avoid gmock link errors within gtest. Signed-off-by: Jason Dillaman --- src/Makefile-env.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Makefile-env.am b/src/Makefile-env.am index 1acb3563ef00a..2304193ce0bd0 100644 --- a/src/Makefile-env.am +++ b/src/Makefile-env.am @@ -85,7 +85,7 @@ AM_COMMON_CPPFLAGS = \ -D_GNU_SOURCE \ -DCEPH_LIBDIR=\"${libdir}\" \ -DCEPH_PKGLIBDIR=\"${pkglibdir}\" \ - -DGTEST_HAS_TR1_TUPLE=0 + -DGTEST_USE_OWN_TR1_TUPLE=0 AM_COMMON_CFLAGS = \ -Wall \ -- 2.39.5