aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/docs/CookBook.md
diff options
context:
space:
mode:
authorChe-Hsun Liu <chehsunliu@gmail.com>2017-08-31 19:02:12 +0800
committerGitHub <noreply@github.com>2017-08-31 19:02:12 +0800
commit3eaba9f07c5f81a8b83432e4ae389ee42337393f (patch)
tree948d6ccdcf5a59ec1310cf81817ea2042236bbb9 /googlemock/docs/CookBook.md
parent24696c3958f0be6a87b52f07436417c53d0fef24 (diff)
parent16bfba08e2c63c33834a98d092cd6f1a3e547289 (diff)
downloadgoogletest-3eaba9f07c5f81a8b83432e4ae389ee42337393f.tar.gz
googletest-3eaba9f07c5f81a8b83432e4ae389ee42337393f.tar.bz2
googletest-3eaba9f07c5f81a8b83432e4ae389ee42337393f.zip
Merge branch 'master' into master
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: