diff options
| author | Li Peng <lip@dtdream.com> | 2016-04-27 08:41:27 (GMT) |
|---|---|---|
| committer | Li Peng <lip@dtdream.com> | 2016-04-27 08:41:27 (GMT) |
| commit | 266a185a528bc2061016f133862e9af67fa126ce (patch) | |
| tree | 7c449c4e5ee8811c5e424003432316921108da49 /googlemock | |
| parent | d225acc90bc3a8c420a9bcd1f033033c1ccd7fe0 (diff) | |
| download | googletest-266a185a528bc2061016f133862e9af67fa126ce.zip googletest-266a185a528bc2061016f133862e9af67fa126ce.tar.gz googletest-266a185a528bc2061016f133862e9af67fa126ce.tar.bz2 | |
remove duplicated wordsrefs/pull/764/head
Signed-off-by: Li Peng <lip@dtdream.com>
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/CHANGES | 2 | ||||
| -rw-r--r-- | googlemock/src/gmock-matchers.cc | 2 | ||||
| -rw-r--r-- | googlemock/test/gmock-generated-actions_test.cc | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/CHANGES b/googlemock/CHANGES index d6f2f76..4328ece 100644 --- a/googlemock/CHANGES +++ b/googlemock/CHANGES @@ -94,7 +94,7 @@ Google Test): * New feature: --gmock_catch_leaked_mocks for detecting leaked mocks. * New feature: ACTION_TEMPLATE for defining templatized actions. * New feature: the .After() clause for specifying expectation order. - * New feature: the .With() clause for for specifying inter-argument + * New feature: the .With() clause for specifying inter-argument constraints. * New feature: actions ReturnArg<k>(), ReturnNew<T>(...), and DeleteArg<k>(). diff --git a/googlemock/src/gmock-matchers.cc b/googlemock/src/gmock-matchers.cc index e742451..d659979 100644 --- a/googlemock/src/gmock-matchers.cc +++ b/googlemock/src/gmock-matchers.cc @@ -288,7 +288,7 @@ class MaxBipartiteMatchState { // Each element of the left_ vector represents a left hand side node // (i.e. an element) and each element of right_ is a right hand side // node (i.e. a matcher). The values in the left_ vector indicate - // outflow from that node to a node on the the right_ side. The values + // outflow from that node to a node on the right_ side. The values // in the right_ indicate inflow, and specify which left_ node is // feeding that right_ node, if any. For example, left_[3] == 1 means // there's a flow from element #3 to matcher #1. Such a flow would also diff --git a/googlemock/test/gmock-generated-actions_test.cc b/googlemock/test/gmock-generated-actions_test.cc index 5ca5bc7..f01390c 100644 --- a/googlemock/test/gmock-generated-actions_test.cc +++ b/googlemock/test/gmock-generated-actions_test.cc @@ -1120,7 +1120,7 @@ TEST(ActionTemplateTest, WorksForIntegralTemplateParams) { EXPECT_FALSE(b); // Verifies that resetter is deleted. } -// Tests that ACTION_TEMPLATES works for template template parameters. +// Tests that ACTION_TEMPLATES works for template parameters. ACTION_TEMPLATE(ReturnSmartPointer, HAS_1_TEMPLATE_PARAMS(template <typename Pointee> class, Pointer), |