Date: Sat, 4 May 2024 13:32:05 GMT From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: d05586213892 - main - math/sprng: fix build with clang 18 Message-ID: <202405041332.444DW5jq074703@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=d05586213892764617a96edec7151b464b1906ff commit d05586213892764617a96edec7151b464b1906ff Author: Thierry Thomas <thierry@FreeBSD.org> AuthorDate: 2024-05-04 13:21:44 +0000 Commit: Thierry Thomas <thierry@FreeBSD.org> CommitDate: 2024-05-04 13:32:02 +0000 math/sprng: fix build with clang 18 This is not a bug of clang. Patch suggested by dim@. PR: 278711 --- math/sprng/files/patch-TESTS_mpitests_wolff.cpp | 37 +++++++++++++++++++++++++ math/sprng/files/patch-TESTS_wolff.cpp | 37 +++++++++++++++++++++++++ math/sprng/files/patch-TESTS_wolfftest.cpp | 37 +++++++++++++++++++++++++ 3 files changed, 111 insertions(+) diff --git a/math/sprng/files/patch-TESTS_mpitests_wolff.cpp b/math/sprng/files/patch-TESTS_mpitests_wolff.cpp new file mode 100644 index 000000000000..30e2f0d3ecda --- /dev/null +++ b/math/sprng/files/patch-TESTS_mpitests_wolff.cpp @@ -0,0 +1,37 @@ +--- TESTS/mpitests/wolff.cpp.orig 2011-08-06 15:58:22 UTC ++++ TESTS/mpitests/wolff.cpp +@@ -14,7 +14,7 @@ using namespace std; + + /*#define PARALLEL*/ + +-int lattice_size, *spin, *stack, nsites; ++int lattice_size, *spin, *my_stack, nsites; + Sprng **genptr; /* array of random number generators */ + int exponent, mask; /* Used for efficiency purposes */ + double prob; +@@ -73,12 +73,12 @@ void Single_Cluster_Update(void) /* update lattice spi + if (genptr[i]->sprng() > prob) + continue; + spin[nnJ]=-spin[nnJ]; +- stack[++Ipt]=nnJ; ++ my_stack[++Ipt]=nnJ; + } + + if(Ipt>=0) + { +- i=stack[Ipt]; ++ i=my_stack[Ipt]; + Ipt--; + } + else i=-1; +@@ -216,8 +216,8 @@ void minitialize(int rng_type, int seed, int param, in + + + spin = static_cast<int *>(malloc(nsites*sizeof(int))); +- stack = static_cast<int *>(malloc(nsites*sizeof(int))); +- if(!spin || !stack) ++ my_stack = static_cast<int *>(malloc(nsites*sizeof(int))); ++ if(!spin || !my_stack) + { + printf("\n\tMemory allocation failure, program exits!\n"); + exit(-1); diff --git a/math/sprng/files/patch-TESTS_wolff.cpp b/math/sprng/files/patch-TESTS_wolff.cpp new file mode 100644 index 000000000000..7b5fcda07c83 --- /dev/null +++ b/math/sprng/files/patch-TESTS_wolff.cpp @@ -0,0 +1,37 @@ +--- TESTS/wolff.cpp.orig 2011-08-06 15:58:04 UTC ++++ TESTS/wolff.cpp +@@ -14,7 +14,7 @@ using namespace std; + + /*#define PARALLEL*/ + +-int lattice_size, *spin, *stack, nsites; ++int lattice_size, *spin, *my_stack, nsites; + Sprng **genptr; /* array of random number generators */ + int exponent, mask; /* Used for efficiency purposes */ + double prob; +@@ -73,12 +73,12 @@ void Single_Cluster_Update(void) /* update lattice spi + if (genptr[i]->sprng() > prob) + continue; + spin[nnJ]=-spin[nnJ]; +- stack[++Ipt]=nnJ; ++ my_stack[++Ipt]=nnJ; + } + + if(Ipt>=0) + { +- i=stack[Ipt]; ++ i=my_stack[Ipt]; + Ipt--; + } + else i=-1; +@@ -216,8 +216,8 @@ void minitialize(int rng_type, int seed, int param, in + + + spin = static_cast<int *>(malloc(nsites*sizeof(int))); +- stack = static_cast<int *>(malloc(nsites*sizeof(int))); +- if(!spin || !stack) ++ my_stack = static_cast<int *>(malloc(nsites*sizeof(int))); ++ if(!spin || !my_stack) + { + printf("\n\tMemory allocation failure, program exits!\n"); + exit(-1); diff --git a/math/sprng/files/patch-TESTS_wolfftest.cpp b/math/sprng/files/patch-TESTS_wolfftest.cpp new file mode 100644 index 000000000000..dc897c35383e --- /dev/null +++ b/math/sprng/files/patch-TESTS_wolfftest.cpp @@ -0,0 +1,37 @@ +--- TESTS/wolfftest.cpp.orig 2009-06-13 21:46:10 UTC ++++ TESTS/wolfftest.cpp +@@ -14,7 +14,7 @@ using namespace std; + + /*#define PARALLEL*/ + +-int lattice_size, *spin, *stack, nsites; ++int lattice_size, *spin, *my_stack, nsites; + Sprng **genptr; /* array of random number generators */ + int exponent, mask; /* Used for efficiency purposes */ + double prob; +@@ -74,12 +74,12 @@ void Single_Cluster_Update(void) /* update lattice spi + if (genptr[i]->sprng() > prob) + continue; + spin[nnJ]=-spin[nnJ]; +- stack[++Ipt]=nnJ; ++ my_stack[++Ipt]=nnJ; + } + + if(Ipt>=0) + { +- i=stack[Ipt]; ++ i=my_stack[Ipt]; + Ipt--; + } + else i=-1; +@@ -217,8 +217,8 @@ void minitialize(int rng_type, int seed, int param, in + + + spin = static_cast<int *>(malloc(nsites*sizeof(int))); +- stack = static_cast<int *>(malloc(nsites*sizeof(int))); +- if(!spin || !stack) ++ my_stack = static_cast<int *>(malloc(nsites*sizeof(int))); ++ if(!spin || !my_stack) + { + printf("\n\tMemory allocation failure, program exits!\n"); + exit(-1);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202405041332.444DW5jq074703>