projects
/
platform
/
upstream
/
gtest.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.11.0
[platform/upstream/gtest.git]
/
googlemock
/
include
/
gmock
/
gmock.h
diff --git
a/googlemock/include/gmock/gmock.h
b/googlemock/include/gmock/gmock.h
index
99c3d78
..
12469bc
100644
(file)
--- a/
googlemock/include/gmock/gmock.h
+++ b/
googlemock/include/gmock/gmock.h
@@
-34,8
+34,8
@@
// GOOGLETEST_CM0002 DO NOT DELETE
// GOOGLETEST_CM0002 DO NOT DELETE
-#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_H_
-#define GMOCK_INCLUDE_GMOCK_GMOCK_H_
+#ifndef G
OOGLE
MOCK_INCLUDE_GMOCK_GMOCK_H_
+#define G
OOGLE
MOCK_INCLUDE_GMOCK_GMOCK_H_
// This file implements the following syntax:
//
// This file implements the following syntax:
//
@@
-59,9
+59,6
@@
#include "gmock/gmock-actions.h"
#include "gmock/gmock-cardinalities.h"
#include "gmock/gmock-function-mocker.h"
#include "gmock/gmock-actions.h"
#include "gmock/gmock-cardinalities.h"
#include "gmock/gmock-function-mocker.h"
-#include "gmock/gmock-generated-actions.h"
-#include "gmock/gmock-generated-function-mockers.h"
-#include "gmock/gmock-generated-matchers.h"
#include "gmock/gmock-matchers.h"
#include "gmock/gmock-more-actions.h"
#include "gmock/gmock-more-matchers.h"
#include "gmock/gmock-matchers.h"
#include "gmock/gmock-more-actions.h"
#include "gmock/gmock-more-matchers.h"
@@
-98,4
+95,4
@@
GTEST_API_ void InitGoogleMock();
} // namespace testing
} // namespace testing
-#endif // GMOCK_INCLUDE_GMOCK_GMOCK_H_
+#endif // G
OOGLE
MOCK_INCLUDE_GMOCK_GMOCK_H_