diff options
| author | Gennadiy Civil <misterg@google.com> | 2018-03-05 12:26:15 -0500 |
|---|---|---|
| committer | Gennadiy Civil <misterg@google.com> | 2018-03-05 12:26:15 -0500 |
| commit | 0d5e01ad7bf0796679417e3acdb0418f5b19fc31 (patch) | |
| tree | e57159c96b66be5596ed3c7d4c12618fc3380b9e /googlemock/include/gmock/internal/custom/gmock-matchers.h | |
| parent | 447d58b4ee8ea96b4757a5bb5f0b3be75af6c2a1 (diff) | |
| download | googletest-0d5e01ad7bf0796679417e3acdb0418f5b19fc31.tar.gz googletest-0d5e01ad7bf0796679417e3acdb0418f5b19fc31.tar.bz2 googletest-0d5e01ad7bf0796679417e3acdb0418f5b19fc31.zip | |
Merges-1
Diffstat (limited to 'googlemock/include/gmock/internal/custom/gmock-matchers.h')
| -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_ |