summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoshua Cannon <joshdcannon@gmail.com>2019-10-11 15:41:47 (GMT)
committerJoshua Cannon <joshdcannon@gmail.com>2019-10-11 15:41:47 (GMT)
commitd935e8e3edaf0987ee8a0a664593e17771587393 (patch)
treee1ef2be47018da0265a7da439133cf891a7362d6
parentc1e8e71aab60158b3653e756f6b6e34180273eda (diff)
downloadgoogletest-d935e8e3edaf0987ee8a0a664593e17771587393.zip
googletest-d935e8e3edaf0987ee8a0a664593e17771587393.tar.gz
googletest-d935e8e3edaf0987ee8a0a664593e17771587393.tar.bz2
Fix preprocessor tests
-rw-r--r--googlemock/include/gmock/internal/gmock-pp.h4
1 files changed, 1 insertions, 3 deletions
diff --git a/googlemock/include/gmock/internal/gmock-pp.h b/googlemock/include/gmock/internal/gmock-pp.h
index e16bc5c..2ebeadd 100644
--- a/googlemock/include/gmock/internal/gmock-pp.h
+++ b/googlemock/include/gmock/internal/gmock-pp.h
@@ -110,7 +110,7 @@
// Expands to 1 if the first argument starts with something in parentheses,
// otherwise to 0.
#define GMOCK_PP_IS_BEGIN_PARENS(...) \
- GMOCK_PP_INTERNAL_ALTERNATE_HEAD( \
+ GMOCK_PP_HEAD( \
GMOCK_PP_CAT(GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_, \
GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C __VA_ARGS__))
@@ -165,8 +165,6 @@
// Workaround MSVC behavior of treating __VA_ARGS__ with commas as one arg
// _Args must be wrapped in parenthesis
#define GMOCK_PP_INTERNAL_EXPAND_WITH(_Macro, _Args) _Macro _Args
-#define GMOCK_PP_INTERNAL_ALTERNATE_HEAD(...) \
- GMOCK_PP_INTERNAL_EXPAND_WITH(GMOCK_PP_HEAD, (__VA_ARGS__))
#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_C(...) 1 _
#define GMOCK_PP_INTERNAL_IBP_IS_VARIADIC_R_1 1,