diff options
| author | Masaru Tsuchiyama <m.tmatma@gmail.com> | 2018-07-19 06:51:13 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 06:51:13 +0900 |
| commit | 40cd5d117035c0e280cbeceac42176ffa75a39a3 (patch) | |
| tree | 01a986456692187392b4349d9009238735d3abb4 /googlemock/include | |
| parent | 234958def514c33d5598d1ba7d81ce6228fa21d2 (diff) | |
| parent | 1370e7658b659247f3c37cd1f07d917d0bd546a0 (diff) | |
| download | googletest-40cd5d117035c0e280cbeceac42176ffa75a39a3.tar.gz googletest-40cd5d117035c0e280cbeceac42176ffa75a39a3.tar.bz2 googletest-40cd5d117035c0e280cbeceac42176ffa75a39a3.zip | |
Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp
Diffstat (limited to 'googlemock/include')
| -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_ |