testing/chromium.patch - Issue 115846: Retry to checkin a version of gmock, modified to use our boost_tuple in VS2005.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side 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, 6 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:

OLD	NEW
(Empty)
	1 diff -ru gmock.orig/include/gmock/internal/gmock-port.h gmock/include/gmock/inte rnal/gmock-port.h

	2 --- gmock.orig/include/gmock/internal/gmock-port.h 2009-05-22 23:58:41.0000 00000 -0700

	3 +++ gmock/include/gmock/internal/gmock-port.h 2009-05-23 00:49:01.000000000 -0 700

	4 @@ -54,9 +54,14 @@

	5 // GCC 4.0+ implements tr1/tuple in the <tr1/tuple> header. This does

	6 // not conform to the TR1 spec, which requires the header to be <tuple>.

	7 #include <tr1/tuple>

	8 +#elif defined(_MSC_VER) && _MSC_VER < 1500

	9 +// For Visual Studio older than 2008, we redirect directly to boost tuple

	10 +// searching from boost's root. This is to avoid extra dirtying of the

	11 +// compiler include paths.

	12 +#include "boost/tr1/tr1/tuple"

	13 #else

	14 -// If the compiler is not GCC 4.0+, we assume the user is using a

	15 -// spec-conforming TR1 implementation.

	16 +// If the compiler is neither GCC 4.0+, nor Visual Studio 2008, we assume the

	17 +// user is using a spec-conforming TR1 implementation.

	18 #include <tuple>

	19 #endif // __GNUC__

	20

OLD	NEW

« no previous file with comments | « testing/README.chromium ('k') | testing/gmock.gyp » ('j') | no next file with comments »