summaryrefslogtreecommitdiffstats
path: root/googlemock/include/gmock
diff options
context:
space:
mode:
authorAbseil Team <absl-team@google.com>2020-07-01 19:40:49 (GMT)
committerDerek Mauro <dmauro@google.com>2020-07-05 20:25:43 (GMT)
commit356f2d264a485db2fcc50ec1c672e0d37b6cb39b (patch)
tree7910915a61e599aeeffc14e018c4bd49e699b834 /googlemock/include/gmock
parentaee0f9d9b5b87796ee8a0ab26b7587ec30e8858e (diff)
downloadgoogletest-356f2d264a485db2fcc50ec1c672e0d37b6cb39b.zip
googletest-356f2d264a485db2fcc50ec1c672e0d37b6cb39b.tar.gz
googletest-356f2d264a485db2fcc50ec1c672e0d37b6cb39b.tar.bz2
Googletest export
Improve compatibility with strict compilers targeting Windows Remove an unnecessary ##, which could result in warnings about invalid preprocessor tokens when pasting to an initial '(' PiperOrigin-RevId: 319277617
Diffstat (limited to 'googlemock/include/gmock')
-rw-r--r--googlemock/include/gmock/gmock-function-mocker.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/googlemock/include/gmock/gmock-function-mocker.h b/googlemock/include/gmock/gmock-function-mocker.h
index 317d6c2..7140a28 100644
--- a/googlemock/include/gmock/gmock-function-mocker.h
+++ b/googlemock/include/gmock/gmock-function-mocker.h
@@ -234,7 +234,7 @@ using internal::FunctionMocker;
GMOCK_INTERNAL_GET_VALUE_CALLTYPE_I( \
GMOCK_PP_CAT(GMOCK_INTERNAL_IS_CALLTYPE_HELPER_, _arg))
#define GMOCK_INTERNAL_GET_VALUE_CALLTYPE_I(_arg) \
- GMOCK_PP_CAT(GMOCK_PP_IDENTITY, _arg)
+ GMOCK_PP_IDENTITY _arg
#define GMOCK_INTERNAL_IS_CALLTYPE_HELPER_Calltype