gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Removes some gmock internal macros; sorts the file lists in Makefile.am; picks up gtest r454.

Browse Source
This commit is contained in:
zhanyong.wan
2010-08-09 22:46:12 +00:00
parent c6333dca1c
commit ccedc1c933
7 changed files with 60 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
include/gmock/gmock-generated-actions.h
View File

@@ -1378,7 +1378,7 @@ DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6,
// The name of the class template implementing the action template.
#define GMOCK_ACTION_CLASS_(name, value_params)\
GMOCK_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
#define ACTION_TEMPLATE(name, template_params, value_params)\
template <GMOCK_INTERNAL_DECL_##template_params\

2
include/gmock/gmock-generated-actions.h.pump
View File

@@ -605,7 +605,7 @@ $if i==1 [[P]] $elif i>=2 [[P$i]]
// The name of the class template implementing the action template.
#define GMOCK_ACTION_CLASS_(name, value_params)\
GMOCK_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params)
$range k 0..n-1

2
include/gmock/gmock-generated-function-mockers.h
View File

@@ -339,7 +339,7 @@ using internal::FunctionMocker;
// The variable for mocking the given method.
// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
#define GMOCK_MOCKER_(arity, constness, Method) \
GMOCK_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
#define GMOCK_METHOD0_(tn, constness, ct, Method, F) \

2
include/gmock/gmock-generated-function-mockers.h.pump
View File

@@ -119,7 +119,7 @@ using internal::FunctionMocker;
// The variable for mocking the given method.
// INTERNAL IMPLEMENTATION - DON'T USE IN USER CODE!!!
#define GMOCK_MOCKER_(arity, constness, Method) \
GMOCK_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
GTEST_CONCAT_TOKEN_(gmock##constness##arity##_##Method##_, __LINE__)
$for i [[

2
include/gmock/gmock-spec-builders.h
View File

@@ -537,7 +537,7 @@ class InSequence {
bool sequence_created_;
GTEST_DISALLOW_COPY_AND_ASSIGN_(InSequence); // NOLINT
} GMOCK_ATTRIBUTE_UNUSED_;
} GTEST_ATTRIBUTE_UNUSED_;
namespace internal {

11
include/gmock/internal/gmock-internal-utils.h
View File

@@ -46,17 +46,6 @@
#include <gmock/internal/gmock-port.h>
#include <gtest/gtest.h>
// Concatenates two pre-processor symbols; works for concatenating
// built-in macros like __FILE__ and __LINE__.
#define GMOCK_CONCAT_TOKEN_IMPL_(foo, bar) foo##bar
#define GMOCK_CONCAT_TOKEN_(foo, bar) GMOCK_CONCAT_TOKEN_IMPL_(foo, bar)
#ifdef __GNUC__
#define GMOCK_ATTRIBUTE_UNUSED_ __attribute__ ((unused))
#else
#define GMOCK_ATTRIBUTE_UNUSED_
#endif // __GNUC__
namespace testing {
namespace internal {