From: Jason Dillaman <dillaman@redhat.com>
Date: Tue, 18 Aug 2015 17:42:45 +0000 (-0400)
Subject: gtest: enable use of TR1 tuples
X-Git-Tag: v9.1.0~172^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=575537046819bb0f5201f7772208c049779d2c07;p=ceph.git

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 <dillaman@redhat.com>
---

diff --git a/src/Makefile-env.am b/src/Makefile-env.am
index 1acb3563ef00..2304193ce0bd 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 \