diff options
author | Masaru Tsuchiyama <m.tmatma@gmail.com> | 2018-07-21 00:18:54 (GMT) |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-07-21 00:18:54 (GMT) |
commit | 534570b5bd8dfcb72643b5e81d3bdcf1b5454149 (patch) | |
tree | c3f2aaa610c9213b54cea2f2a3a96bb1c0189f02 /googlemock/docs/CookBook.md | |
parent | 40cd5d117035c0e280cbeceac42176ffa75a39a3 (diff) | |
parent | 2a151c93c180ac765c27c5f2e37af9366abd4d55 (diff) | |
download | googletest-534570b5bd8dfcb72643b5e81d3bdcf1b5454149.zip googletest-534570b5bd8dfcb72643b5e81d3bdcf1b5454149.tar.gz googletest-534570b5bd8dfcb72643b5e81d3bdcf1b5454149.tar.bz2 |
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
Diffstat (limited to 'googlemock/docs/CookBook.md')
-rw-r--r-- | googlemock/docs/CookBook.md | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/googlemock/docs/CookBook.md b/googlemock/docs/CookBook.md index bd9f026..8809b0e 100644 --- a/googlemock/docs/CookBook.md +++ b/googlemock/docs/CookBook.md @@ -2247,7 +2247,7 @@ enum class AccessLevel { kInternal, kPublic }; class Buzz { public: - explicit Buzz(AccessLevel access) { … } + explicit Buzz(AccessLevel access) { ... } ... }; @@ -2320,7 +2320,7 @@ Note that `ByMove()` is essential here - if you drop it, the code won’t compil Quiz time! What do you think will happen if a `Return(ByMove(...))` action is performed more than once (e.g. you write -`….WillRepeatedly(Return(ByMove(...)));`)? Come think of it, after the first +`.WillRepeatedly(Return(ByMove(...)));`)? Come think of it, after the first time the action runs, the source value will be consumed (since it’s a move-only value), so the next time around, there’s no value to move from -- you’ll get a run-time error that `Return(ByMove(...))` can only be run once. |