diff options
author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-02-09 11:34:26 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-09 11:34:26 -0500 |
commit | 22a115055a34443a01a3006bc2e0c1697c29abe1 (patch) | |
tree | 2dbf937d53ed9ff07d4ea8ae75d28d96914309d1 /googlemock/include | |
parent | c211f21906ca1b40bd10b46052cde85b291963f6 (diff) | |
parent | c8510504ddf3bd9e486fdce076bdf5dba62d18bb (diff) | |
download | googletest-22a115055a34443a01a3006bc2e0c1697c29abe1.tar.gz googletest-22a115055a34443a01a3006bc2e0c1697c29abe1.tar.bz2 googletest-22a115055a34443a01a3006bc2e0c1697c29abe1.zip |
Merge pull request #1446 from tholsapp/master
Fixed typos
Diffstat (limited to 'googlemock/include')
-rw-r--r-- | googlemock/include/gmock/gmock-matchers.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h index 41bf6de3..94c23d38 100644 --- a/googlemock/include/gmock/gmock-matchers.h +++ b/googlemock/include/gmock/gmock-matchers.h @@ -1550,7 +1550,7 @@ class BothOfMatcherImpl : public MatcherInterface<T> { // MatcherList provides mechanisms for storing a variable number of matchers in // a list structure (ListType) and creating a combining matcher from such a // list. -// The template is defined recursively using the following template paramters: +// The template is defined recursively using the following template parameters: // * kSize is the length of the MatcherList. // * Head is the type of the first matcher of the list. // * Tail denotes the types of the remaining matchers of the list. @@ -2379,7 +2379,7 @@ class ResultOfMatcher { private: // Functors often define operator() as non-const method even though - // they are actualy stateless. But we need to use them even when + // they are actually stateless. But we need to use them even when // 'this' is a const pointer. It's the user's responsibility not to // use stateful callables with ResultOf(), which does't guarantee // how many times the callable will be invoked. |