mirror of
https://git.FreeBSD.org/ports.git
synced 2024-11-18 00:10:04 +00:00
math/sprng: fix build with clang 18
This is not a bug of clang. Patch suggested by dim@. PR: 278711
This commit is contained in:
parent
a16c8ea404
commit
d055862138
37
math/sprng/files/patch-TESTS_mpitests_wolff.cpp
Normal file
37
math/sprng/files/patch-TESTS_mpitests_wolff.cpp
Normal file
@ -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);
|
37
math/sprng/files/patch-TESTS_wolff.cpp
Normal file
37
math/sprng/files/patch-TESTS_wolff.cpp
Normal file
@ -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);
|
37
math/sprng/files/patch-TESTS_wolfftest.cpp
Normal file
37
math/sprng/files/patch-TESTS_wolfftest.cpp
Normal file
@ -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);
|
Loading…
Reference in New Issue
Block a user