aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/docs/CookBook.md
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2017-09-06 14:29:25 -0400
committerGitHub <noreply@github.com>2017-09-06 14:29:25 -0400
commit8b491162f79282b79292e0f4166194b3f7ccb7b1 (patch)
treeb6e5d65fcf25c9353d110820cad4a1ab7e1be353 /googlemock/docs/CookBook.md
parenta1c332cdbe89ea3b0be9ea5bef18aefe835d7ee1 (diff)
parent8a3ccc3ee36342c149a696b3c0e5ba9d4938efa9 (diff)
downloadgoogletest-8b491162f79282b79292e0f4166194b3f7ccb7b1.tar.gz
googletest-8b491162f79282b79292e0f4166194b3f7ccb7b1.tar.bz2
googletest-8b491162f79282b79292e0f4166194b3f7ccb7b1.zip
Merge branch 'master' into support_xboxone
Diffstat (limited to 'googlemock/docs/CookBook.md')
-rw-r--r--googlemock/docs/CookBook.md4
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/docs/CookBook.md b/googlemock/docs/CookBook.md
index 6ea7f3a9..753c6dd3 100644
--- a/googlemock/docs/CookBook.md
+++ b/googlemock/docs/CookBook.md
@@ -148,7 +148,7 @@ Note that the mock class doesn't define `AppendPacket()`, unlike the
real class. That's fine as long as the test doesn't need to call it.
Next, you need a way to say that you want to use
-`ConcretePacketStream` in production code, and use `MockPacketStream`
+`ConcretePacketStream` in production code and to use `MockPacketStream`
in tests. Since the functions are not virtual and the two classes are
unrelated, you must specify your choice at _compile time_ (as opposed
to run time).
@@ -706,7 +706,7 @@ type `m` accepts):
1. When both `T` and `U` are built-in arithmetic types (`bool`, integers, and floating-point numbers), the conversion from `T` to `U` is not lossy (in other words, any value representable by `T` can also be represented by `U`); and
1. When `U` is a reference, `T` must also be a reference (as the underlying matcher may be interested in the address of the `U` value).
-The code won't compile if any of these conditions isn't met.
+The code won't compile if any of these conditions aren't met.
Here's one example: