diff --git a/hyperpoint.cpp b/hyperpoint.cpp index 5f916c11..55d9f042 100644 --- a/hyperpoint.cpp +++ b/hyperpoint.cpp @@ -44,19 +44,13 @@ eVariation variation; * */ -#if ISSTEAM && ISLINUX -#define ONLY_STEAMLINUX(x) x -#else -#define ONLY_STEAMLINUX(x) -#endif - struct hyperpoint : array { hyperpoint() {} #if MAXMDIM == 4 - constexpr hyperpoint(ld x, ld y, ld z, ld w) : array { ONLY_STEAMLINUX((array)) {x, y, z, w}} { + constexpr hyperpoint(ld x, ld y, ld z, ld w) : array { ONLY_GCC46((array)) {x, y, z, w}} { #else - constexpr hyperpoint(ld x, ld y, ld z, ld w) : array { ONLY_STEAMLINUX((array)) {x, y, z}} { + constexpr hyperpoint(ld x, ld y, ld z, ld w) : array { ONLY_GCC46((array)) {x, y, z}} { #endif // self[0] = x; self[1] = y; self[2] = z; // if(MAXMDIM == 4) self[3] = w; diff --git a/sysconfig.h b/sysconfig.h index 1180c525..95a24f96 100644 --- a/sysconfig.h +++ b/sysconfig.h @@ -47,8 +47,11 @@ #define ISSTEAM 0 #endif -#if ISSTEAM +#if GCC46 #define override +#define ONLY_GCC46(x) x +#else +#define ONLY_GCC46(x) #endif #ifndef ISWEB