diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-03-05 12:26:15 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-03-05 12:26:15 -0500 |
| commit | 0d5e01ad7bf0796679417e3acdb0418f5b19fc31 (patch) | |
| tree | e57159c96b66be5596ed3c7d4c12618fc3380b9e /googlemock/test/gmock_link_test.h | |
| parent | 447d58b4ee8ea96b4757a5bb5f0b3be75af6c2a1 (diff) | |
| download | googletest-0d5e01ad7bf0796679417e3acdb0418f5b19fc31.tar.gz googletest-0d5e01ad7bf0796679417e3acdb0418f5b19fc31.tar.bz2 googletest-0d5e01ad7bf0796679417e3acdb0418f5b19fc31.zip | |
Merges-1
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 |