diff options
| author | tisi1988 <tisi1988@gmail.com> | 2018-07-23 10:10:26 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-23 10:10:26 +0200 |
| commit | 1ae4fdb79009322d90c304fd49d4fb625b408823 (patch) | |
| tree | 6c343daa47b77dffb5b08cf64fe11f4b9fe1b63a /googlemock/include/gmock/internal/custom/gmock-matchers.h | |
| parent | de6e079f15b0d1988033fc8203d172f493d08506 (diff) | |
| parent | 2a151c93c180ac765c27c5f2e37af9366abd4d55 (diff) | |
| download | googletest-1ae4fdb79009322d90c304fd49d4fb625b408823.tar.gz googletest-1ae4fdb79009322d90c304fd49d4fb625b408823.tar.bz2 googletest-1ae4fdb79009322d90c304fd49d4fb625b408823.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock/include/gmock/internal/custom/gmock-matchers.h')
| -rw-r--r-- | googlemock/include/gmock/internal/custom/gmock-matchers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/include/gmock/internal/custom/gmock-matchers.h b/googlemock/include/gmock/internal/custom/gmock-matchers.h index fe0d9e84..af8240e6 100644 --- a/googlemock/include/gmock/internal/custom/gmock-matchers.h +++ b/googlemock/include/gmock/internal/custom/gmock-matchers.h @@ -32,7 +32,7 @@ // ============================================================ // // Adds google3 callback support to CallableTraits. -// + #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_ |