diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-07-18 14:09:06 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-18 14:09:06 -0400 |
| commit | 43163c19d5ab08c47ff24f9320758092af6e38e8 (patch) | |
| tree | 0257d2004642fddeb101a0b0a6653ea723ece533 /googlemock/include | |
| parent | a091b753325322d329dc89262bfe5ad0ab20f1bf (diff) | |
| parent | 4235fff7f4c3d96319e18bbcc5cc2eacee12b6da (diff) | |
| download | googletest-43163c19d5ab08c47ff24f9320758092af6e38e8.tar.gz googletest-43163c19d5ab08c47ff24f9320758092af6e38e8.tar.bz2 googletest-43163c19d5ab08c47ff24f9320758092af6e38e8.zip | |
Merge branch 'master' into ignore-ds-store
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_ |