diff options
| author | duxiuxing <duxiuxing@qq.com> | 2018-07-19 18:38:20 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-19 18:38:20 +0800 |
| commit | 5b19054b024079b32f49d53b1f254e03d85a0a99 (patch) | |
| tree | a69aa5c43888f135523148fad576d2dc0387504f /googlemock/include/gmock/internal | |
| parent | 65a49a73f0e7c059ad67d768c860bb296383fd56 (diff) | |
| parent | 1370e7658b659247f3c37cd1f07d917d0bd546a0 (diff) | |
| download | googletest-5b19054b024079b32f49d53b1f254e03d85a0a99.tar.gz googletest-5b19054b024079b32f49d53b1f254e03d85a0a99.tar.bz2 googletest-5b19054b024079b32f49d53b1f254e03d85a0a99.zip | |
Merge branch 'master' into googletest_for_asam
Diffstat (limited to 'googlemock/include/gmock/internal')
| -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_ |