aboutsummaryrefslogtreecommitdiff
path: root/Carpet/LoopControl/src
diff options
context:
space:
mode:
authorErik Schnetter <schnetter@gmail.com>2013-01-25 15:59:42 -0500
committerErik Schnetter <schnetter@gmail.com>2013-02-08 08:58:22 -0500
commit35ab8f2e490478fb8a3c79861c06841e0d273fca (patch)
tree5ab099dadd2fccc7890772854627359f184ce29c /Carpet/LoopControl/src
parentefb2159426c07efb0e457a27eaf70b6bebbe6a20 (diff)
LoopControl: Remove restrict qualifiers from shared data structures
Diffstat (limited to 'Carpet/LoopControl/src')
-rw-r--r--Carpet/LoopControl/src/loopcontrol.cc6
-rw-r--r--Carpet/LoopControl/src/loopcontrol.h6
2 files changed, 6 insertions, 6 deletions
diff --git a/Carpet/LoopControl/src/loopcontrol.cc b/Carpet/LoopControl/src/loopcontrol.cc
index 4dfb29d02..c9ff97e56 100644
--- a/Carpet/LoopControl/src/loopcontrol.cc
+++ b/Carpet/LoopControl/src/loopcontrol.cc
@@ -600,7 +600,7 @@ void lc_control_init(lc_control_t* restrict const control,
// Initialise selftest
if (selftest) {
- unsigned char* restrict selftest_array;
+ unsigned char* selftest_array;
#pragma omp single copyprivate(selftest_array)
{
ptrdiff_t const npoints = prod(control->ash);
@@ -614,7 +614,7 @@ void lc_control_init(lc_control_t* restrict const control,
}
void lc_control_finish(lc_control_t* restrict const control,
- lc_stats_t* restrict const stats)
+ lc_stats_t* const stats)
{
DECLARE_CCTK_PARAMETERS;
@@ -807,7 +807,7 @@ void lc_statistics(CCTK_ARGUMENTS)
for (list<lc_stats_t*>::const_iterator
istats = all_stats.begin(); istats != all_stats.end(); ++istats)
{
- lc_stats_t const* restrict const stats = *istats;
+ lc_stats_t const* const stats = *istats;
if (stats->count == 0.0) {
printf(" Loop %s (%s:%d):\n",
stats->name, stats->file, stats->line);
diff --git a/Carpet/LoopControl/src/loopcontrol.h b/Carpet/LoopControl/src/loopcontrol.h
index 075bd5dcf..9c0dd46c2 100644
--- a/Carpet/LoopControl/src/loopcontrol.h
+++ b/Carpet/LoopControl/src/loopcontrol.h
@@ -73,7 +73,7 @@ extern "C" {
struct lc_fine_thread_comm_t* fine_thread_comm_ptr; /* shared
between SMT
threads */
- unsigned char* restrict selftest_array;
+ unsigned char* selftest_array; /* shared between all threads */
} lc_control_t;
@@ -81,13 +81,13 @@ extern "C" {
void lc_stats_init(struct lc_stats_t** stats,
char const* name, char const* file, int line);
void lc_control_init(lc_control_t* restrict control,
- struct lc_stats_t *restrict stats,
+ struct lc_stats_t *stats,
ptrdiff_t imin, ptrdiff_t jmin, ptrdiff_t kmin,
ptrdiff_t imax, ptrdiff_t jmax, ptrdiff_t kmax,
ptrdiff_t iash, ptrdiff_t jash, ptrdiff_t kash,
ptrdiff_t di, ptrdiff_t dj, ptrdiff_t dk);
void lc_control_finish(lc_control_t* restrict control,
- struct lc_stats_t *restrict stats);
+ struct lc_stats_t* stats);
void lc_thread_init(lc_control_t* restrict control);
int lc_thread_done(lc_control_t const* restrict control);