diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-02-09 11:42:05 -0500 | 
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-02-09 11:42:05 -0500 | 
| commit | b324a36c35c1f3397e0a6d664114980f3f7ddff8 (patch) | |
| tree | 6ff499e0888f6cc6b0bc89aea9f512123780706f /googlemock/include | |
| parent | 092d0885332316ca679ac77e0f8fe1f5c368fb4f (diff) | |
| parent | 22a115055a34443a01a3006bc2e0c1697c29abe1 (diff) | |
| download | googletest-b324a36c35c1f3397e0a6d664114980f3f7ddff8.tar.gz googletest-b324a36c35c1f3397e0a6d664114980f3f7ddff8.tar.bz2 googletest-b324a36c35c1f3397e0a6d664114980f3f7ddff8.zip | |
Merge branch 'master' into assert
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. | 
