diff options
| author | Bernhard Bauer <sheepmaster@gmail.com> | 2018-03-12 18:15:35 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-12 18:15:35 +0000 |
| commit | fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d (patch) | |
| tree | 0718a372bf66172bf4d3415eca6eb5d1f96b41fa /googlemock/include/gmock/internal/custom | |
| parent | 7b70413e0ca57b3e48d7655f342122f159f52b31 (diff) | |
| parent | abc6e943e0878af67b91fa8a646edf717195c80c (diff) | |
| download | googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.tar.gz googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.tar.bz2 googletest-fc437ef4b2c0a0302a6b0771c334ca51dc1ccf7d.zip | |
Merge branch 'master' into upstream_188748737
Diffstat (limited to 'googlemock/include/gmock/internal/custom')
| -rw-r--r-- | googlemock/include/gmock/internal/custom/gmock-matchers.h | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/googlemock/include/gmock/internal/custom/gmock-matchers.h b/googlemock/include/gmock/internal/custom/gmock-matchers.h index f2efef91..fe0d9e84 100644 --- a/googlemock/include/gmock/internal/custom/gmock-matchers.h +++ b/googlemock/include/gmock/internal/custom/gmock-matchers.h @@ -33,7 +33,6 @@ // // Adds google3 callback support to CallableTraits. // -#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_ -#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_ - -#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_CALLBACK_MATCHERS_H_ +#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_ |