diff options
| author | Gennadiy Civil <gennadiycivil@users.noreply.github.com> | 2018-08-16 13:37:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-08-16 13:37:53 -0400 |
| commit | 8c86040dd67276750df67db6d5791fd32cc479a6 (patch) | |
| tree | 8159016df37d93a62fa5ed3e0a9f65005cfa5919 /googlemock | |
| parent | 3c4f437c241b29b848255535518860fd5397d9f5 (diff) | |
| parent | 8b34930c62c21c281bfd756b05a471cca2312aca (diff) | |
| download | googletest-8c86040dd67276750df67db6d5791fd32cc479a6.tar.gz googletest-8c86040dd67276750df67db6d5791fd32cc479a6.tar.bz2 googletest-8c86040dd67276750df67db6d5791fd32cc479a6.zip | |
Merge branch 'master' into master
Diffstat (limited to 'googlemock')
| -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_ |