testing/gmock/include/gmock/gmock-generated-function-mockers.h.pump - Issue 3427004: clang: update gtest/gmock

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

Unified Diff: testing/gmock/include/gmock/gmock-generated-function-mockers.h.pump

Issue 3427004: clang: update gtest/gmock (Closed) Base URL: http://src.chromium.org/git/chromium.git

Patch Set: yakshave Created 10 years, 3 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/gmock/include/gmock/gmock-generated-function-mockers.h ('k') | testing/gmock/include/gmock/gmock-generated-matchers.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: testing/gmock/include/gmock/gmock-generated-function-mockers.h.pump

diff --git a/testing/gmock/include/gmock/gmock-generated-function-mockers.h.pump b/testing/gmock/include/gmock/gmock-generated-function-mockers.h.pump

index 619debd262f486c100fe9895896c253a16e35c91..20a445413fe00de58a85b7baafd08f2ea4775e45 100644

--- a/testing/gmock/include/gmock/gmock-generated-function-mockers.h.pump

+++ b/testing/gmock/include/gmock/gmock-generated-function-mockers.h.pump

@@ -132,7 +132,7 @@ $var matcher_as = [[$for j, \

// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!

#define GMOCK_METHOD$i[[]]_(tn, constness, ct, Method, F) \

GMOCK_RESULT_(tn, F) ct Method($arg_as) constness { \

- GMOCK_COMPILE_ASSERT_(::std::tr1::tuple_size< \

+ GTEST_COMPILE_ASSERT_(::std::tr1::tuple_size< \

tn ::testing::internal::Function<F>::ArgumentTuple>::value == $i, \

this_method_does_not_take_$i[[]]_argument[[$if i != 1 [[s]]]]); \

GMOCK_MOCKER_($i, constness, Method).SetOwnerAndName(this, #Method); \