diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-18 11:54:56 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-18 11:54:56 -0400 |
| commit | 4235fff7f4c3d96319e18bbcc5cc2eacee12b6da (patch) | |
| tree | 8a1159944a965dd829a9f97b31acee44ed0a6cd1 /googlemock/include/gmock/internal/custom | |
| parent | 20ef7944a410c5e01a35156b784266615d5ad38c (diff) | |
| parent | d41bfd732f3980c573f8fa27faf4d38d7fb16a45 (diff) | |
| download | googletest-4235fff7f4c3d96319e18bbcc5cc2eacee12b6da.tar.gz googletest-4235fff7f4c3d96319e18bbcc5cc2eacee12b6da.tar.bz2 googletest-4235fff7f4c3d96319e18bbcc5cc2eacee12b6da.zip | |
Merge pull request #1671 from gennadiycivil/master
Code merge
Diffstat (limited to 'googlemock/include/gmock/internal/custom')
| -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_ |