Merges-1

2018-03-05 12:26:15 -05:00
parent 447d58b4ee
commit 0d5e01ad7b
3 changed files with 17 additions and 12 deletions
--- 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