Author: hdu
Date: Tue Jun 3 14:39:51 2014
New Revision: 1599586
URL: http://svn.apache.org/r1599586
Log:
#i125003# use gtest's internal tuple class for its own needs
test scripts using gtest include that gtest.h header with its dependencies.
Using the system tuple header results in slight problems on RHEL5 that can
be easily avoided by enabling gtest's internal tuple functionality. Other
platforms also benefit from the reduced header dependencies.
Added:
openoffice/trunk/ext_libraries/gtest/use-own-tuple.patch
Modified:
openoffice/trunk/ext_libraries/gtest/makefile.mk
Modified: openoffice/trunk/ext_libraries/gtest/makefile.mk
URL:
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/gtest/makefile.mk?rev=1599586&r1=1599585&r2=1599586&view=diff
==============================================================================
--- openoffice/trunk/ext_libraries/gtest/makefile.mk (original)
+++ openoffice/trunk/ext_libraries/gtest/makefile.mk Tue Jun 3 14:39:51 2014
@@ -46,7 +46,7 @@ TARFILE_NAME=$(PRJNAME)-$(LIBGTESTVERSIO
# thankfully, does not care.
TARFILE_MD5=2d6ec8ccdf5c46b05ba54a9fd1d130d7
-PATCH_FILES=
+PATCH_FILES= use-own-tuple.patch
.IF "$(OS)"=="WNT"
Added: openoffice/trunk/ext_libraries/gtest/use-own-tuple.patch
URL:
http://svn.apache.org/viewvc/openoffice/trunk/ext_libraries/gtest/use-own-tuple.patch?rev=1599586&view=auto
==============================================================================
--- openoffice/trunk/ext_libraries/gtest/use-own-tuple.patch (added)
+++ openoffice/trunk/ext_libraries/gtest/use-own-tuple.patch Tue Jun 3
14:39:51 2014
@@ -0,0 +1,12 @@
+--- misc/gtest-1.7.0/include/gtest/internal/gtest-port.h 2013-09-18
19:48:30.000000000 +0200
++++ misc/build/gtest-1.7.0/include/gtest/internal/gtest-port.h 2014-06-03
15:14:03.000000000 +0200
+@@ -76,6 +76,9 @@
+ // Test's own tr1 tuple implementation should be
+ // used. Unused when the user sets
+ // GTEST_HAS_TR1_TUPLE to 0.
++
++#define GTEST_USE_OWN_TR1_TUPLE 1
++
+ // GTEST_LANG_CXX11 - Define it to 1/0 to indicate that Google Test
+ // is building in C++11/C++98 mode.
+ // GTEST_LINKED_AS_SHARED_LIBRARY
