summaryrefslogtreecommitdiffstats
path: root/googlemock/include
diff options
context:
space:
mode:
authorTroy Holsapple <troy.holsapple@gmail.com>2018-02-08 06:06:00 (GMT)
committerTroy Holsapple <troy.holsapple@gmail.com>2018-02-08 06:06:00 (GMT)
commitc8510504ddf3bd9e486fdce076bdf5dba62d18bb (patch)
treeffdf7a37e88e36216955c70f209afacdb3b506e9 /googlemock/include
parenta3c73ed28d7995b18d48027aee740ad827fcc157 (diff)
downloadgoogletest-c8510504ddf3bd9e486fdce076bdf5dba62d18bb.zip
googletest-c8510504ddf3bd9e486fdce076bdf5dba62d18bb.tar.gz
googletest-c8510504ddf3bd9e486fdce076bdf5dba62d18bb.tar.bz2
Diffstat (limited to 'googlemock/include')
-rw-r--r--googlemock/include/gmock/gmock-matchers.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/include/gmock/gmock-matchers.h b/googlemock/include/gmock/gmock-matchers.h
index 41bf6de..94c23d3 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.