diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-19 11:07:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 11:07:10 -0400 |
| commit | 1f9c668a0452148f725b242079f70d65d3e93153 (patch) | |
| tree | c7943a50a25fa435e9f823329f67e40c34a73147 /googlemock/include | |
| parent | 378de8f72a43d1916774370aafea30e424e6d148 (diff) | |
| parent | 1370e7658b659247f3c37cd1f07d917d0bd546a0 (diff) | |
| download | googletest-1f9c668a0452148f725b242079f70d65d3e93153.tar.gz googletest-1f9c668a0452148f725b242079f70d65d3e93153.tar.bz2 googletest-1f9c668a0452148f725b242079f70d65d3e93153.zip | |
Merge branch 'master' into deprecate
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_ |