aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/docs/CookBook.md
diff options
context:
space:
mode:
authorTanzinul Islam <t_17_7@hotmail.com>2017-09-06 01:05:24 +0100
committerTanzinul Islam <t_17_7@hotmail.com>2017-09-06 01:05:24 +0100
commit78b1ff074799c776f90a77203fcd7adc98e11736 (patch)
tree21974f2d4f0d4aeaff5a4027df84889a2619ae25 /googlemock/docs/CookBook.md
parenta838de3348add7530431e8d91c8a66cc646f1888 (diff)
parent857ddeadebe4aa75efcee728651d0947a5a1065a (diff)
downloadgoogletest-78b1ff074799c776f90a77203fcd7adc98e11736.tar.gz
googletest-78b1ff074799c776f90a77203fcd7adc98e11736.tar.bz2
googletest-78b1ff074799c776f90a77203fcd7adc98e11736.zip
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
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: