diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-03-05 13:21:59 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-05 13:21:59 -0500 |
| commit | a7ffeca97406195813604d6f5ea2d834019d9b07 (patch) | |
| tree | 958da545e95d20a0d41c1ff4b606546d33a23215 /googlemock | |
| parent | 915c8d051d0a717f8af6559c03e4220e3c39a24c (diff) | |
| parent | a518bd5cf27f723cd1c2249287d43e3a7bb016c1 (diff) | |
| download | googletest-a7ffeca97406195813604d6f5ea2d834019d9b07.tar.gz googletest-a7ffeca97406195813604d6f5ea2d834019d9b07.tar.bz2 googletest-a7ffeca97406195813604d6f5ea2d834019d9b07.zip | |
Merge pull request #1488 from gennadiycivil/master
Merges
Diffstat (limited to 'googlemock')
| -rw-r--r-- | googlemock/include/gmock/internal/custom/gmock-matchers.h | 7 | ||||
| -rw-r--r-- | googlemock/test/gmock_link_test.h | 2 |
2 files changed, 5 insertions, 4 deletions
diff --git a/googlemock/include/gmock/internal/custom/gmock-matchers.h b/googlemock/include/gmock/internal/custom/gmock-matchers.h index f2efef91..fe0d9e84 100644 --- a/googlemock/include/gmock/internal/custom/gmock-matchers.h +++ b/googlemock/include/gmock/internal/custom/gmock-matchers.h @@ -33,7 +33,6 @@ // // Adds google3 callback support to CallableTraits. // -#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_ -#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_ - -#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_ +#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_ +#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_ +#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_MATCHERS_H_ 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 |