From 30234303223aa20d2d8d6cfaa8d7510352ae8202 Mon Sep 17 00:00:00 2001 From: Nir Friedman Date: Mon, 20 May 2019 02:51:13 -0400 Subject: [PATCH 1/4] Reduce default number of enumerators for MSVC compatibility --- wise_enum_generated.h | 447 ++---------------------------------------- 1 file changed, 14 insertions(+), 433 deletions(-) diff --git a/wise_enum_generated.h b/wise_enum_generated.h index 2d01968..b8e7d51 100644 --- a/wise_enum_generated.h +++ b/wise_enum_generated.h @@ -11,50 +11,24 @@ _91, _92, _93, _94, _95, _96, _97, _98, _99, _100, \ _101, _102, _103, _104, _105, _106, _107, _108, _109, _110, \ _111, _112, _113, _114, _115, _116, _117, _118, _119, _120, \ - _121, _122, _123, _124, _125, _126, _127, _128, _129, _130, \ - _131, _132, _133, _134, _135, _136, _137, _138, _139, _140, \ - _141, _142, _143, _144, _145, _146, _147, _148, _149, _150, \ - _151, _152, _153, _154, _155, _156, _157, _158, _159, _160, \ - _161, _162, _163, _164, _165, _166, _167, _168, _169, _170, \ - _171, _172, _173, _174, _175, _176, _177, _178, _179, _180, \ - _181, _182, _183, _184, _185, _186, _187, _188, _189, _190, \ - _191, _192, _193, _194, _195, _196, _197, _198, _199, _200, \ - _201, _202, _203, _204, _205, _206, _207, _208, _209, _210, \ - _211, _212, _213, _214, _215, _216, _217, _218, _219, _220, \ - _221, _222, _223, _224, _225, _226, _227, _228, _229, _230, \ - _231, _232, _233, _234, _235, _236, _237, _238, _239, _240, \ - _241, _242, _243, _244, _245, _246, _247, _248, _249, _250, \ - _251, _252, _253, _254, _255, _256, N, ... \ + _121, _122, _123, _124, _125, N, ... \ ) \ N \ #define WISE_ENUM_IMPL_RSEQ_N() \ - 256, 255, 254, 253, 252, 251, 250, 249, 248, 247, \ - 246, 245, 244, 243, 242, 241, 240, 239, 238, 237, \ - 236, 235, 234, 233, 232, 231, 230, 229, 228, 227, \ - 226, 225, 224, 223, 222, 221, 220, 219, 218, 217, \ - 216, 215, 214, 213, 212, 211, 210, 209, 208, 207, \ - 206, 205, 204, 203, 202, 201, 200, 199, 198, 197, \ - 196, 195, 194, 193, 192, 191, 190, 189, 188, 187, \ - 186, 185, 184, 183, 182, 181, 180, 179, 178, 177, \ - 176, 175, 174, 173, 172, 171, 170, 169, 168, 167, \ - 166, 165, 164, 163, 162, 161, 160, 159, 158, 157, \ - 156, 155, 154, 153, 152, 151, 150, 149, 148, 147, \ - 146, 145, 144, 143, 142, 141, 140, 139, 138, 137, \ - 136, 135, 134, 133, 132, 131, 130, 129, 128, 127, \ - 126, 125, 124, 123, 122, 121, 120, 119, 118, 117, \ - 116, 115, 114, 113, 112, 111, 110, 109, 108, 107, \ - 106, 105, 104, 103, 102, 101, 100, 99, 98, 97, \ - 96, 95, 94, 93, 92, 91, 90, 89, 88, 87, \ - 86, 85, 84, 83, 82, 81, 80, 79, 78, 77, \ - 76, 75, 74, 73, 72, 71, 70, 69, 68, 67, \ - 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, \ - 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, \ - 46, 45, 44, 43, 42, 41, 40, 39, 38, 37, \ - 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, \ - 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, \ - 16, 15, 14, 13, 12, 11, 10, 9, 8, 7, \ - 6, 5, 4, 3, 2, 1, 0 \ + 125, 124, 123, 122, 121, 120, 119, 118, 117, 116, \ + 115, 114, 113, 112, 111, 110, 109, 108, 107, 106, \ + 105, 104, 103, 102, 101, 100, 99, 98, 97, 96, \ + 95, 94, 93, 92, 91, 90, 89, 88, 87, 86, \ + 85, 84, 83, 82, 81, 80, 79, 78, 77, 76, \ + 75, 74, 73, 72, 71, 70, 69, 68, 67, 66, \ + 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, \ + 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, \ + 45, 44, 43, 42, 41, 40, 39, 38, 37, 36, \ + 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, \ + 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, \ + 15, 14, 13, 12, 11, 10, 9, 8, 7, 6, \ + 5, 4, 3, 2, 1, 0 \ #define WISE_ENUM_IMPL_LOOP_1(M, C, D, x) M(C, x) @@ -430,396 +404,3 @@ #define WISE_ENUM_IMPL_LOOP_125(M, C, D, x, ...) M(C, x) D() \ WISE_ENUM_IMPL_LOOP_124(M, C, D, __VA_ARGS__) -#define WISE_ENUM_IMPL_LOOP_126(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_125(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_127(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_126(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_128(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_127(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_129(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_128(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_130(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_129(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_131(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_130(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_132(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_131(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_133(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_132(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_134(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_133(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_135(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_134(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_136(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_135(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_137(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_136(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_138(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_137(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_139(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_138(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_140(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_139(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_141(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_140(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_142(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_141(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_143(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_142(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_144(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_143(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_145(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_144(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_146(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_145(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_147(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_146(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_148(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_147(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_149(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_148(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_150(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_149(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_151(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_150(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_152(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_151(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_153(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_152(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_154(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_153(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_155(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_154(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_156(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_155(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_157(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_156(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_158(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_157(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_159(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_158(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_160(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_159(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_161(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_160(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_162(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_161(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_163(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_162(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_164(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_163(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_165(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_164(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_166(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_165(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_167(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_166(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_168(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_167(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_169(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_168(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_170(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_169(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_171(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_170(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_172(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_171(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_173(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_172(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_174(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_173(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_175(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_174(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_176(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_175(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_177(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_176(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_178(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_177(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_179(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_178(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_180(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_179(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_181(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_180(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_182(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_181(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_183(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_182(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_184(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_183(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_185(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_184(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_186(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_185(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_187(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_186(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_188(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_187(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_189(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_188(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_190(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_189(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_191(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_190(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_192(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_191(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_193(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_192(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_194(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_193(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_195(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_194(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_196(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_195(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_197(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_196(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_198(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_197(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_199(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_198(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_200(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_199(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_201(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_200(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_202(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_201(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_203(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_202(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_204(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_203(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_205(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_204(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_206(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_205(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_207(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_206(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_208(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_207(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_209(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_208(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_210(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_209(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_211(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_210(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_212(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_211(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_213(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_212(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_214(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_213(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_215(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_214(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_216(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_215(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_217(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_216(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_218(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_217(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_219(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_218(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_220(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_219(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_221(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_220(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_222(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_221(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_223(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_222(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_224(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_223(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_225(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_224(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_226(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_225(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_227(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_226(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_228(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_227(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_229(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_228(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_230(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_229(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_231(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_230(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_232(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_231(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_233(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_232(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_234(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_233(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_235(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_234(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_236(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_235(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_237(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_236(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_238(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_237(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_239(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_238(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_240(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_239(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_241(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_240(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_242(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_241(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_243(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_242(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_244(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_243(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_245(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_244(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_246(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_245(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_247(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_246(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_248(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_247(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_249(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_248(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_250(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_249(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_251(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_250(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_252(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_251(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_253(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_252(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_254(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_253(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_255(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_254(M, C, D, __VA_ARGS__) - -#define WISE_ENUM_IMPL_LOOP_256(M, C, D, x, ...) M(C, x) D() \ - WISE_ENUM_IMPL_LOOP_255(M, C, D, __VA_ARGS__) - From 34d400fea0320109199e853d1f8207ca781bb72c Mon Sep 17 00:00:00 2001 From: Nir Friedman Date: Mon, 20 May 2019 10:07:37 -0400 Subject: [PATCH 2/4] Further appveyor fix for x64 environ --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 94eaafe..e212da4 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -11,7 +11,8 @@ environment: CONFIG: Release build_script: - - vcpkg install catch2 + - vcpkg install catch2:x86-windows + - vcpkg install catch2:x64-windows - ps: cd test - cmake -DCMAKE_TOOLCHAIN_FILE=c:/tools/vcpkg/scripts/buildsystems/vcpkg.cmake "-G%GENERATOR%" -H. -B_builds -DENABLE_TESTING=1 - cmake --build _builds --config "%CONFIG%" From 0458e4e26421ca097910d7fe5e9fc48f63b28743 Mon Sep 17 00:00:00 2001 From: Nir Friedman Date: Mon, 20 May 2019 10:34:09 -0400 Subject: [PATCH 3/4] Add MSVC 17 to matrix --- appveyor.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/appveyor.yml b/appveyor.yml index e212da4..87e0be9 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -10,6 +10,9 @@ environment: - GENERATOR: "Visual Studio 15 Win64" CONFIG: Release + - GENERATOR: "Visual Studio 17 Win64" + CONFIG: Release + build_script: - vcpkg install catch2:x86-windows - vcpkg install catch2:x64-windows From 0813466ba401421f48c4a05e92edbddd99cb181c Mon Sep 17 00:00:00 2001 From: Nir Friedman Date: Mon, 20 May 2019 17:41:30 -0400 Subject: [PATCH 4/4] Add MSVC macro counting workaround --- wise_enum_detail.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/wise_enum_detail.h b/wise_enum_detail.h index 3c03de5..d3864cf 100644 --- a/wise_enum_detail.h +++ b/wise_enum_detail.h @@ -95,8 +95,12 @@ WISE_ENUM_CONSTEXPR_14 bool compare(U u1, U u2) { } // namespace detail } // namespace wise_enum +// MSVC workaround +#define WISE_ENUM_IMPL_EXPAND(X) X + #define WISE_ENUM_IMPL_NARG(...) \ - WISE_ENUM_IMPL_NARG_(__VA_ARGS__, WISE_ENUM_IMPL_RSEQ_N()) + WISE_ENUM_IMPL_EXPAND( \ + WISE_ENUM_IMPL_NARG_(__VA_ARGS__, WISE_ENUM_IMPL_RSEQ_N())) #define WISE_ENUM_IMPL_NARG_(...) WISE_ENUM_IMPL_ARG_N(__VA_ARGS__) // ARG_N and RSEQ_N defined in wise_enum_generated.h