Created
October 18, 2013 18:54
-
-
Save pgriess/7046324 to your computer and use it in GitHub Desktop.
Patch to get gtest-1.6.0 building against Mac OS X / libc++.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diff -ur gtest-1.6.0-PRISTINE/fused-src/gtest/gtest.h gtest-1.6.0/fused-src/gtest/gtest.h | |
--- gtest-1.6.0-PRISTINE/fused-src/gtest/gtest.h 2011-04-15 14:54:57.000000000 -0500 | |
+++ gtest-1.6.0/fused-src/gtest/gtest.h 2013-10-18 13:50:34.000000000 -0500 | |
@@ -544,7 +544,7 @@ | |
// defining __GNUC__ and friends, but cannot compile GCC's tuple | |
// implementation. MSVC 2008 (9.0) provides TR1 tuple in a 323 MB | |
// Feature Pack download, which we cannot assume the user has. | |
-# if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000)) \ | |
+# if (defined(__GNUC__) && !defined(__CUDACC__) && !defined(_LIBCPP_VERSION) && (GTEST_GCC_VER_ >= 40000)) \ | |
|| _MSC_VER >= 1600 | |
# define GTEST_USE_OWN_TR1_TUPLE 0 | |
# else | |
diff -ur gtest-1.6.0-PRISTINE/include/gtest/internal/gtest-port.h gtest-1.6.0/include/gtest/internal/gtest-port.h | |
--- gtest-1.6.0-PRISTINE/include/gtest/internal/gtest-port.h 2011-04-15 14:49:10.000000000 -0500 | |
+++ gtest-1.6.0/include/gtest/internal/gtest-port.h 2013-10-18 13:50:29.000000000 -0500 | |
@@ -449,7 +449,7 @@ | |
// defining __GNUC__ and friends, but cannot compile GCC's tuple | |
// implementation. MSVC 2008 (9.0) provides TR1 tuple in a 323 MB | |
// Feature Pack download, which we cannot assume the user has. | |
-# if (defined(__GNUC__) && !defined(__CUDACC__) && (GTEST_GCC_VER_ >= 40000)) \ | |
+# if (defined(__GNUC__) && !defined(__CUDACC__) && !defined(_LIBCPP_VERSION) && (GTEST_GCC_VER_ >= 40000)) \ | |
|| _MSC_VER >= 1600 | |
# define GTEST_USE_OWN_TR1_TUPLE 0 | |
# else |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment