Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(616)

Unified Diff: testing/chromium.patch

Issue 115846: Retry to checkin a version of gmock, modified to use our boost_tuple in VS2005. (Closed)
Patch Set: Created 11 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « testing/README.chromium ('k') | testing/gmock.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/chromium.patch
diff --git a/testing/chromium.patch b/testing/chromium.patch
new file mode 100644
index 0000000000000000000000000000000000000000..26b566294b25f0f306485d9c0929f76283a6cb90
--- /dev/null
+++ b/testing/chromium.patch
@@ -0,0 +1,20 @@
+diff -ru gmock.orig/include/gmock/internal/gmock-port.h gmock/include/gmock/internal/gmock-port.h
+--- gmock.orig/include/gmock/internal/gmock-port.h 2009-05-22 23:58:41.000000000 -0700
++++ gmock/include/gmock/internal/gmock-port.h 2009-05-23 00:49:01.000000000 -0700
+@@ -54,9 +54,14 @@
+ // GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header. This does
+ // not conform to the TR1 spec, which requires the header to be <tuple>.
+ #include <tr1/tuple>
++#elif defined(_MSC_VER) && _MSC_VER < 1500
++// For Visual Studio older than 2008, we redirect directly to boost tuple
++// searching from boost's root. This is to avoid extra dirtying of the
++// compiler include paths.
++#include "boost/tr1/tr1/tuple"
+ #else
+-// If the compiler is not GCC 4.0+, we assume the user is using a
+-// spec-conforming TR1 implementation.
++// If the compiler is neither GCC 4.0+, nor Visual Studio 2008, we assume the
++// user is using a spec-conforming TR1 implementation.
+ #include <tuple>
+ #endif // __GNUC__
+
« no previous file with comments | « testing/README.chromium ('k') | testing/gmock.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698