From ecc6908807193f7c7afb4fadf36f2941f173981a Mon Sep 17 00:00:00 2001 From: Zeno Rogue Date: Tue, 3 Sep 2019 08:25:05 +0200 Subject: [PATCH] fixes for older compilers --- hyperpoint.cpp | 10 ++++++++-- nonisotropic.cpp | 2 +- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/hyperpoint.cpp b/hyperpoint.cpp index f13b1a0b..9d87f87f 100644 --- a/hyperpoint.cpp +++ b/hyperpoint.cpp @@ -43,13 +43,19 @@ 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 {{x, y, z, w}} { + constexpr hyperpoint(ld x, ld y, ld z, ld w) : array { ONLY_STEAMLINUX((array)) {x, y, z, w}} { #else - constexpr hyperpoint(ld x, ld y, ld z, ld w) : array {{x, y, z}} { + constexpr hyperpoint(ld x, ld y, ld z, ld w) : array { ONLY_STEAMLINUX((array)) {x, y, z}} { #endif // self[0] = x; self[1] = y; self[2] = z; // if(MAXMDIM == 4) self[3] = w; diff --git a/nonisotropic.cpp b/nonisotropic.cpp index 635c8ddb..df6bfde5 100644 --- a/nonisotropic.cpp +++ b/nonisotropic.cpp @@ -986,7 +986,7 @@ EX namespace slr { if(phi < 0) { find_alpha(-phi, r, -theta, alpha, s, beta); alpha = -alpha; beta = -beta; return; } ld mina = 0, maxa = M_PI/2; - bool next_nan; + bool next_nan = true; ld c; for(int it=0; it<40; it++) {