Solve issues with preprocessor on MSVC 2022.

viferga · viferga · commit 9a0b71d8f5fd · 2025-06-04T01:21:45.000+02:00
diff --git a/source/preprocessor/cmake/preprocessor_arguments_body.h.in b/source/preprocessor/cmake/preprocessor_arguments_body.h.in
@@ -47,7 +47,7 @@
 		PREPROCESSOR_ARGS_COMMA(PREPROCESSOR_COMMA_VARIADIC __VA_ARGS__ ()) \
 	)
 
-#if defined(__GNUC__) || defined(__clang__)
+#if defined(__GNUC__) || defined(__clang__) || (defined(_MSC_VER) && _MSC_VER >= 1930)
 #	define PREPROCESSOR_ARGS_COUNT_IMPL(...) \
 		PREPROCESSOR_ARGS_N_IMPL(__VA_ARGS__)
 #	define PREPROCESSOR_ARGS_COUNT(...) \
diff --git a/source/preprocessor/cmake/preprocessor_for_body.h.in b/source/preprocessor/cmake/preprocessor_for_body.h.in
@@ -18,7 +18,7 @@
 	expr(element) PREPROCESSOR_FOR_EACH_EVAL(PREPROCESSOR_FOR_EACH_IMPL_1(expr, __VA_ARGS__))
 #endif
 @PREPROCESSOR_FOR_EACH_IMPL_BODY@
-#if defined(__GNUC__) || defined(__clang__)
+#if defined(__GNUC__) || defined(__clang__) || (defined(_MSC_VER) && _MSC_VER >= 1930)
 #	define PREPROCESSOR_FOR_EACH(expr, ...) \
 		PREPROCESSOR_IF(PREPROCESSOR_ARGS_EMPTY(__VA_ARGS__), \
 			PREPROCESSOR_EMPTY_SYMBOL(), \
@@ -57,7 +57,7 @@
 	expr(context, iterator, element) PREPROCESSOR_FOR_EVAL(PREPROCESSOR_FOR_IMPL_1(expr, context, PREPROCESSOR_INCREMENT(iterator), __VA_ARGS__))
 #endif
 @PREPROCESSOR_FOR_IMPL_BODY@
-#if defined(__GNUC__) || defined(__clang__)
+#if defined(__GNUC__) || defined(__clang__) || (defined(_MSC_VER) && _MSC_VER >= 1930)
 #	define PREPROCESSOR_FOR(expr, context, ...) \
 		PREPROCESSOR_IF(PREPROCESSOR_ARGS_EMPTY(__VA_ARGS__), \
 			PREPROCESSOR_EMPTY_SYMBOL(), \
diff --git a/source/preprocessor/include/preprocessor/preprocessor_arguments.h b/source/preprocessor/include/preprocessor/preprocessor_arguments.h
@@ -104,7 +104,7 @@ extern "C" {
 		PREPROCESSOR_ARGS_COMMA(PREPROCESSOR_COMMA_VARIADIC __VA_ARGS__ ()) \
 	)
 
-#if defined(__GNUC__) || defined(__clang__)
+#if defined(__GNUC__) || defined(__clang__) || (defined(_MSC_VER) && _MSC_VER >= 1930)
 #	define PREPROCESSOR_ARGS_COUNT_IMPL(...) \
 		PREPROCESSOR_ARGS_N_IMPL(__VA_ARGS__)
 #	define PREPROCESSOR_ARGS_COUNT(...) \
diff --git a/source/preprocessor/include/preprocessor/preprocessor_for.h b/source/preprocessor/include/preprocessor/preprocessor_for.h
@@ -115,7 +115,7 @@ extern "C" {
 #define PREPROCESSOR_FOR_EACH_IMPL_63(expr, element, ...) expr(element) PREPROCESSOR_FOR_EACH_EVAL(PREPROCESSOR_FOR_EACH_IMPL_62(expr, __VA_ARGS__))
 #define PREPROCESSOR_FOR_EACH_IMPL_64(expr, element, ...) expr(element) PREPROCESSOR_FOR_EACH_EVAL(PREPROCESSOR_FOR_EACH_IMPL_63(expr, __VA_ARGS__))
 
-#if defined(__GNUC__) || defined(__clang__)
+#if defined(__GNUC__) || defined(__clang__) || (defined(_MSC_VER) && _MSC_VER >= 1930)
 #	define PREPROCESSOR_FOR_EACH(expr, ...) \
 		PREPROCESSOR_IF(PREPROCESSOR_ARGS_EMPTY(__VA_ARGS__), \
 			PREPROCESSOR_EMPTY_SYMBOL(), \
@@ -222,7 +222,7 @@ extern "C" {
 #define PREPROCESSOR_FOR_IMPL_63(expr, context, iterator, element, ...) expr(context, iterator, element) PREPROCESSOR_FOR_EVAL(PREPROCESSOR_FOR_IMPL_62(expr, context, PREPROCESSOR_INCREMENT(iterator), __VA_ARGS__))
 #define PREPROCESSOR_FOR_IMPL_64(expr, context, iterator, element, ...) expr(context, iterator, element) PREPROCESSOR_FOR_EVAL(PREPROCESSOR_FOR_IMPL_63(expr, context, PREPROCESSOR_INCREMENT(iterator), __VA_ARGS__))
 
-#if defined(__GNUC__) || defined(__clang__)
+#if defined(__GNUC__) || defined(__clang__) || (defined(_MSC_VER) && _MSC_VER >= 1930)
 #	define PREPROCESSOR_FOR(expr, context, ...) \
 		PREPROCESSOR_IF(PREPROCESSOR_ARGS_EMPTY(__VA_ARGS__), \
 			PREPROCESSOR_EMPTY_SYMBOL(), \

Original file line number	Diff line number	Diff line change
`@@ -47,7 +47,7 @@`
`47`	`47`	`PREPROCESSOR_ARGS_COMMA(PREPROCESSOR_COMMA_VARIADIC __VA_ARGS__ ()) \`
`48`	`48`	`)`
`49`	`49`
`50`		`-#if defined(__GNUC__) \|\| defined(__clang__)`
	`50`	`+#if defined(__GNUC__) \|\| defined(__clang__) \|\| (defined(_MSC_VER) && _MSC_VER >= 1930)`
`51`	`51`	`# define PREPROCESSOR_ARGS_COUNT_IMPL(...) \`
`52`	`52`	`PREPROCESSOR_ARGS_N_IMPL(__VA_ARGS__)`
`53`	`53`	`# define PREPROCESSOR_ARGS_COUNT(...) \`
Original file line number	Diff line number	Diff line change
`@@ -104,7 +104,7 @@ extern "C" {`
`104`	`104`	`PREPROCESSOR_ARGS_COMMA(PREPROCESSOR_COMMA_VARIADIC __VA_ARGS__ ()) \`
`105`	`105`	`)`
`106`	`106`
`107`		`-#if defined(__GNUC__) \|\| defined(__clang__)`
	`107`	`+#if defined(__GNUC__) \|\| defined(__clang__) \|\| (defined(_MSC_VER) && _MSC_VER >= 1930)`
`108`	`108`	`# define PREPROCESSOR_ARGS_COUNT_IMPL(...) \`
`109`	`109`	`PREPROCESSOR_ARGS_N_IMPL(__VA_ARGS__)`
`110`	`110`	`# define PREPROCESSOR_ARGS_COUNT(...) \`