]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
gtest: enable use of TR1 tuples
authorJason Dillaman <dillaman@redhat.com>
Tue, 18 Aug 2015 17:42:45 +0000 (13:42 -0400)
committerJason Dillaman <dillaman@redhat.com>
Fri, 4 Sep 2015 03:18:36 +0000 (23:18 -0400)
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>
src/Makefile-env.am

index 1acb3563ef00ac00d45fe0e4d817af0d89fae87c..2304193ce0bd0065ed78d7604ffe808b58a10d69 100644 (file)
@@ -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 \