aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/docs/CookBook.md
diff options
context:
space:
mode:
authorGennadiy Civil <gennadiycivil@users.noreply.github.com>2017-08-30 14:11:38 -0400
committerGitHub <noreply@github.com>2017-08-30 14:11:38 -0400
commitbb1c4af48702b934e1a768150f6283ec8c916fb9 (patch)
treea22d6a494f7ab69401ef4b5ec138cdec1b682e36 /googlemock/docs/CookBook.md
parentc3d1d33560462c923f06adb8e9c2f77ffbafa46c (diff)
parent5d431c650f9c4d0aefdcca72d4b950ea8f0214ac (diff)
downloadgoogletest-bb1c4af48702b934e1a768150f6283ec8c916fb9.tar.gz
googletest-bb1c4af48702b934e1a768150f6283ec8c916fb9.tar.bz2
googletest-bb1c4af48702b934e1a768150f6283ec8c916fb9.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: