Merge branch 'master' into cleanup-cmake

2018-08-17 13:52:35 +02:00
parent 0489d80590 c3ef06399d
commit cc134a591e
3 changed files with 49 additions and 7 deletions
--- 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_