diff options
| author | Che-Hsun Liu <chehsunliu@gmail.com> | 2017-08-14 14:51:49 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-14 14:51:49 +0800 |
| commit | 24696c3958f0be6a87b52f07436417c53d0fef24 (patch) | |
| tree | 4993eb36b3296281b188b5adf662951c910c7fb2 /googlemock/include | |
| parent | 509f7fe84094dc632ba1794c1f9bd3a7c049d5fe (diff) | |
| parent | 673c975a963f356b19fea90cb57b69192253da2a (diff) | |
| download | googletest-24696c3958f0be6a87b52f07436417c53d0fef24.tar.gz googletest-24696c3958f0be6a87b52f07436417c53d0fef24.tar.bz2 googletest-24696c3958f0be6a87b52f07436417c53d0fef24.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/include')
| -rw-r--r-- | googlemock/include/gmock/gmock-actions.h | 8 | ||||
| -rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/googlemock/include/gmock/gmock-actions.h b/googlemock/include/gmock/gmock-actions.h index b3f654af..845c8232 100644 --- a/googlemock/include/gmock/gmock-actions.h +++ b/googlemock/include/gmock/gmock-actions.h @@ -1029,9 +1029,9 @@ class DoBothAction { // return sqrt(x*x + y*y); // } // ... -// EXEPCT_CALL(mock, Foo("abc", _, _)) +// EXPECT_CALL(mock, Foo("abc", _, _)) // .WillOnce(Invoke(DistanceToOriginWithLabel)); -// EXEPCT_CALL(mock, Bar(5, _, _)) +// EXPECT_CALL(mock, Bar(5, _, _)) // .WillOnce(Invoke(DistanceToOriginWithIndex)); // // you could write @@ -1041,8 +1041,8 @@ class DoBothAction { // return sqrt(x*x + y*y); // } // ... -// EXEPCT_CALL(mock, Foo("abc", _, _)).WillOnce(Invoke(DistanceToOrigin)); -// EXEPCT_CALL(mock, Bar(5, _, _)).WillOnce(Invoke(DistanceToOrigin)); +// EXPECT_CALL(mock, Foo("abc", _, _)).WillOnce(Invoke(DistanceToOrigin)); +// EXPECT_CALL(mock, Bar(5, _, _)).WillOnce(Invoke(DistanceToOrigin)); typedef internal::IgnoredValue Unused; // This constructor allows us to turn an Action<From> object into an diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 9ade5b64..3a97c438 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -646,7 +646,7 @@ class SafeMatcherCastImpl { // type U. GTEST_COMPILE_ASSERT_( internal::is_reference<T>::value || !internal::is_reference<U>::value, - cannot_convert_non_referentce_arg_to_reference); + cannot_convert_non_reference_arg_to_reference); // In case both T and U are arithmetic types, enforce that the // conversion is not lossy. typedef GTEST_REMOVE_REFERENCE_AND_CONST_(T) RawT; |