From cf1df9d3a828053f5cf07ae63afc2d7c31f1959e Mon Sep 17 00:00:00 2001 From: Richard Kreckel Date: Sun, 29 Nov 2015 12:33:59 +0100 Subject: [PATCH 1/1] Rename array of precomputed data in test suite. Reason: C++17 may introduce a std::data<> template. Right now, the GCC 6.0 prerelease bails out at this code, when compiler with -std=c++17. --- check/exam_inifcns_nstdsums.cpp | 14 +++++++------- check/exam_inifcns_nstdsums.h | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/check/exam_inifcns_nstdsums.cpp b/check/exam_inifcns_nstdsums.cpp index 0fbfaec6..6e4d846a 100644 --- a/check/exam_inifcns_nstdsums.cpp +++ b/check/exam_inifcns_nstdsums.cpp @@ -55,15 +55,15 @@ using namespace std; * Write[st,Chop[N[PolyLog[i,j,-x[[k]]+I*y[[l]]],25]]],{i,3},{j,3}], {k,4}], {l,3}] * Close[st] * - * + * * and postprocessed by the following shell script * * * #/bin/sh * IFS=$'\n' * cat exam_inifcns_nstdsums_data.raw | sed -e 's/\*\^/E/g' > exam_inifcns_nstdsums_data.raw2 - * echo 'const char *data[] = {' > exam_inifcns_nstdsums_data.raw3 - * for i in `cat exam_inifcns_nstdsums_data.raw2`; do echo \"$i\",; done >> exam_inifcns_nstdsums_data.raw3 + * echo 'constexpr string polylogdata[] = {' > exam_inifcns_nstdsums.h + * for i in `cat exam_inifcns_nstdsums_data.raw2`; do echo \"$i\",; done >> exam_inifcns_nstdsums.h * echo '"-999"};' >> exam_inifcns_nstdsums.h * * @@ -86,13 +86,13 @@ static unsigned inifcns_test_S() int i = 0; while (true) { - ex n(data[i++],symbol()); + ex n(polylogdata[i++],symbol()); if (n == ENDMARK) { break; } - ex p(data[i++],symbol()); - ex x(data[i++],symbol()); - ex res(data[i++],symbol()); + ex p(polylogdata[i++],symbol()); + ex x(polylogdata[i++],symbol()); + ex res(polylogdata[i++],symbol()); ex res2 = S(n, p, x).evalf(); if (abs(res-res2) > prec) { clog << "S(" << n << "," << p << "," << x << ") seems to be wrong:" << endl; diff --git a/check/exam_inifcns_nstdsums.h b/check/exam_inifcns_nstdsums.h index 48c0a8ed..fcd73cba 100644 --- a/check/exam_inifcns_nstdsums.h +++ b/check/exam_inifcns_nstdsums.h @@ -20,7 +20,7 @@ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ -string data[] = { +string polylogdata[] = { "1", "1", "1/5", -- 2.45.0