summaryrefslogtreecommitdiffstats
path: root/googlemock
diff options
context:
space:
mode:
authorHenry Schreiner <henryschreineriii@utexas.edu>2018-08-17 11:52:35 (GMT)
committerGitHub <noreply@github.com>2018-08-17 11:52:35 (GMT)
commita65a993a3c00d8f93a19eb38f7e31277f547514f (patch)
tree2b33ed7be724055867f69c51f2042b1c96a96404 /googlemock
parent1246e5807a94081049285e8fda4309f67ef571b4 (diff)
parentf87798a3f7c73e069becf5792d0443d5cba42434 (diff)
downloadgoogletest-a65a993a3c00d8f93a19eb38f7e31277f547514f.zip
googletest-a65a993a3c00d8f93a19eb38f7e31277f547514f.tar.gz
googletest-a65a993a3c00d8f93a19eb38f7e31277f547514f.tar.bz2
Merge branch 'master' into cleanup-cmakerefs/pull/1546/head
Diffstat (limited to 'googlemock')
-rw-r--r--googlemock/include/gmock/gmock-more-matchers.h6
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 e5460e7..1c9a399 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_