diff options
| author | Tanzinul Islam <t_17_7@hotmail.com> | 2018-04-01 13:43:57 +0100 |
|---|---|---|
| committer | Tanzinul Islam <t_17_7@hotmail.com> | 2018-04-01 13:43:57 +0100 |
| commit | 5c7c365d5f3e5467de350f2e81a31407a3f52505 (patch) | |
| tree | 475f7996651558fde1e45d7f37b62bc3b9aca272 /googlemock/test/gmock_link_test.h | |
| parent | 6d089311ca2a6fd83dff9ed68c1d3eb00c1443d0 (diff) | |
| parent | 7888184f28509dba839e3683409443e0b5bb8948 (diff) | |
| download | googletest-5c7c365d5f3e5467de350f2e81a31407a3f52505.tar.gz googletest-5c7c365d5f3e5467de350f2e81a31407a3f52505.tar.bz2 googletest-5c7c365d5f3e5467de350f2e81a31407a3f52505.zip | |
Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Diffstat (limited to 'googlemock/test/gmock_link_test.h')
| -rw-r--r-- | googlemock/test/gmock_link_test.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/googlemock/test/gmock_link_test.h b/googlemock/test/gmock_link_test.h index 5f855d19..06a1cf89 100644 --- a/googlemock/test/gmock_link_test.h +++ b/googlemock/test/gmock_link_test.h @@ -90,8 +90,10 @@ // Field // Property // ResultOf(function) +// ResultOf(callback) // Pointee // Truly(predicate) +// AddressSatisfies // AllOf // AnyOf // Not |