diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-17 13:31:01 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-17 13:31:01 -0400 |
| commit | edc1bc606eb46c6786710a6e6303bb91400b2fe0 (patch) | |
| tree | 3efa24596fe5d94d9b82ca8070ffa70852a8520a /googlemock/include | |
| parent | 7e7e3a6f45db62d470c9d15b062582e9e95d3bcd (diff) | |
| parent | 02a8ca87735601466d8c564344f9be493da84708 (diff) | |
| download | googletest-edc1bc606eb46c6786710a6e6303bb91400b2fe0.tar.gz googletest-edc1bc606eb46c6786710a6e6303bb91400b2fe0.tar.bz2 googletest-edc1bc606eb46c6786710a6e6303bb91400b2fe0.zip | |
Merge branch 'master' into patch-1
Diffstat (limited to 'googlemock/include')
| -rw-r--r-- | googlemock/include/gmock/gmock-more-matchers.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/googlemock/include/gmock/gmock-more-matchers.h b/googlemock/include/gmock/gmock-more-matchers.h index e5460e79..1c9a399a 100644 --- a/googlemock/include/gmock/gmock-more-matchers.h +++ b/googlemock/include/gmock/gmock-more-matchers.h @@ -37,8 +37,8 @@ // GOOGLETEST_CM0002 DO NOT DELETE -#ifndef GMOCK_GMOCK_MORE_MATCHERS_H_ -#define GMOCK_GMOCK_MORE_MATCHERS_H_ +#ifndef GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_ +#define GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_ #include "gmock/gmock-generated-matchers.h" @@ -89,4 +89,4 @@ MATCHER(IsFalse, negation ? "is true" : "is false") { } // namespace testing -#endif // GMOCK_GMOCK_MORE_MATCHERS_H_ +#endif // GMOCK_INCLUDE_GMOCK_MORE_MATCHERS_H_ |