aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorschnetter <>2003-05-13 10:19:00 +0000
committerschnetter <>2003-05-13 10:19:00 +0000
commitff0345961593717f21dda874f65762f501ac6a84 (patch)
tree591fd03385e0d596611b3ebe93983ebdf9006d20
parentc5e68615d13e2d12779c9d0347fbcc0eebaf4f5e (diff)
Make code const-correct. Well, sort of.
darcs-hash:20030513101942-07bb3-2a9b4aa40aafc2566a13522ff7704e480e9817b6.gz
-rw-r--r--Carpet/CarpetInterp/src/interp.cc16
-rw-r--r--Carpet/CarpetReduce/src/reduce.cc8
-rw-r--r--Carpet/CarpetSlab/src/slab.cc8
3 files changed, 16 insertions, 16 deletions
diff --git a/Carpet/CarpetInterp/src/interp.cc b/Carpet/CarpetInterp/src/interp.cc
index 8c8313f1c..52304501b 100644
--- a/Carpet/CarpetInterp/src/interp.cc
+++ b/Carpet/CarpetInterp/src/interp.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.5 2003/05/13 12:14:00 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.6 2003/05/13 12:19:42 schnetter Exp $
#include <assert.h>
#include <math.h>
@@ -19,7 +19,7 @@
#include "interp.hh"
extern "C" {
- static char const * const rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.5 2003/05/13 12:14:00 schnetter Exp $";
+ static char const * const rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetInterp/src/interp.cc,v 1.6 2003/05/13 12:19:42 schnetter Exp $";
CCTK_FILEVERSION(Carpet_CarpetInterp_interp_cc);
}
@@ -229,13 +229,13 @@ namespace CarpetInterp {
int const saved_mglevel = mglevel;
int const saved_component = component;
if (component!=-1) {
- set_component (cgh, -1);
+ set_component ((cGH*)cgh, -1);
}
if (mglevel!=-1) {
- set_mglevel (cgh, -1);
+ set_mglevel ((cGH*)cgh, -1);
}
if (reflevel!=-1) {
- set_reflevel (cgh, -1);
+ set_reflevel ((cGH*)cgh, -1);
}
BEGIN_REFLEVEL_LOOP(cgh) {
if (reflevel>=minrl && reflevel<maxrl) {
@@ -331,13 +331,13 @@ namespace CarpetInterp {
}
} END_REFLEVEL_LOOP(cgh);
if (saved_reflevel!=-1) {
- set_reflevel (cgh, saved_reflevel);
+ set_reflevel ((cGH*)cgh, saved_reflevel);
}
if (saved_mglevel!=-1) {
- set_mglevel (cgh, saved_mglevel);
+ set_mglevel ((cGH*)cgh, saved_mglevel);
}
if (saved_component!=-1) {
- set_component (cgh, saved_component);
+ set_component ((cGH*)cgh, saved_component);
}
diff --git a/Carpet/CarpetReduce/src/reduce.cc b/Carpet/CarpetReduce/src/reduce.cc
index 118ecf5be..5e6f46a76 100644
--- a/Carpet/CarpetReduce/src/reduce.cc
+++ b/Carpet/CarpetReduce/src/reduce.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.20 2003/05/13 12:14:00 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.21 2003/05/13 12:19:42 schnetter Exp $
#include <assert.h>
#include <float.h>
@@ -22,7 +22,7 @@
#include "reduce.hh"
extern "C" {
- static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.20 2003/05/13 12:14:00 schnetter Exp $";
+ static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.21 2003/05/13 12:19:42 schnetter Exp $";
CCTK_FILEVERSION(Carpet_CarpetReduce_reduce_cc);
}
@@ -713,7 +713,7 @@ namespace CarpetReduce {
int const saved_component = component;
if (component!=-1) {
- set_component (cgh, -1);
+ set_component ((cGH*)cgh, -1);
}
BEGIN_LOCAL_COMPONENT_LOOP(cgh) {
@@ -762,7 +762,7 @@ namespace CarpetReduce {
} END_LOCAL_COMPONENT_LOOP(cgh);
if (saved_component!=-1) {
- set_component (cgh, saved_component);
+ set_component ((cGH*)cgh, saved_component);
}
Finalise (cgh, proc, num_outvals, outvals, outtype,
diff --git a/Carpet/CarpetSlab/src/slab.cc b/Carpet/CarpetSlab/src/slab.cc
index 440f27f42..6526e5cb0 100644
--- a/Carpet/CarpetSlab/src/slab.cc
+++ b/Carpet/CarpetSlab/src/slab.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.6 2003/05/13 12:14:00 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.7 2003/05/13 12:19:42 schnetter Exp $
#include <assert.h>
#include <stdlib.h>
@@ -21,7 +21,7 @@
#include "slab.hh"
extern "C" {
- static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.6 2003/05/13 12:14:00 schnetter Exp $";
+ static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetSlab/src/slab.cc,v 1.7 2003/05/13 12:19:42 schnetter Exp $";
CCTK_FILEVERSION(Carpet_CarpetSlab_slab_cc);
}
@@ -54,7 +54,7 @@ namespace CarpetSlab {
// Save global state
int saved_component = component;
if (component!=-1) {
- set_component (cgh, -1);
+ set_component ((cGH*)cgh, -1);
}
// Check Cactus grid hierarchy
@@ -238,7 +238,7 @@ namespace CarpetSlab {
// Restore global state
if (saved_component!=-1) {
- set_component (cgh, saved_component);
+ set_component ((cGH*)cgh, saved_component);
}
// Success