diff options
author | schnetter <> | 2003-03-12 08:34:00 +0000 |
---|---|---|
committer | schnetter <> | 2003-03-12 08:34:00 +0000 |
commit | ec58c3b331ed01c871bff85bf2a99e482b771c0c (patch) | |
tree | fb074a633e2a4ab0be3bf92245a9ec60bc2958a3 | |
parent | 788e08d5874a630f5cce5b804b4eedd15d5a9fd0 (diff) |
Change many "cGH *" to "const cGH *", and apply corresponding updates
Change many "cGH *" to "const cGH *", and apply corresponding updates
to the const-ness of other variables.
darcs-hash:20030312083444-07bb3-0f26f780a1bdfb844c3e00383f787d674dc61c84.gz
-rw-r--r-- | Carpet/CarpetIOASCII/src/ioascii.cc | 4 | ||||
-rw-r--r-- | Carpet/CarpetReduce/src/reduce.cc | 16 | ||||
-rw-r--r-- | CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc | 6 | ||||
-rw-r--r-- | CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh | 6 |
4 files changed, 16 insertions, 16 deletions
diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc index d6a62755d..c51f85de7 100644 --- a/Carpet/CarpetIOASCII/src/ioascii.cc +++ b/Carpet/CarpetIOASCII/src/ioascii.cc @@ -30,7 +30,7 @@ #include "ioascii.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.43 2003/01/03 15:49:36 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.44 2003/03/12 09:34:44 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetIOASCII_ioascii_cc); } @@ -759,7 +759,7 @@ namespace CarpetIOASCII { switch (CCTK_VarTypeI(vi)) { #define TYPECASE(N,T) \ case N: \ - os << (*(data<T,D>*)gfdata)[index]; \ + os << (*(const data<T,D>*)gfdata)[index]; \ break; #include "Carpet/Carpet/src/typecase" #undef TYPECASE diff --git a/Carpet/CarpetReduce/src/reduce.cc b/Carpet/CarpetReduce/src/reduce.cc index fe81eaf55..4c59f54cf 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.13 2002/10/24 10:51:13 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.14 2003/03/12 09:34:44 schnetter Exp $ #include <assert.h> #include <float.h> @@ -20,7 +20,7 @@ #include "reduce.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.13 2002/10/24 10:51:13 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetReduce/src/reduce.cc,v 1.14 2003/03/12 09:34:44 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetReduce_reduce_cc); } @@ -275,7 +275,7 @@ namespace CarpetReduce { template<class T,class OP> void finalise (void* const outval, const void* const cnt) { - OP::finalise (*(T*)outval, *(T*)cnt); + OP::finalise (*(T*)outval, *(const T*)cnt); } @@ -661,10 +661,10 @@ namespace CarpetReduce { #define REDUCTION(OP) \ - int OP##_arrays (cGH * const cgh, const int proc, \ - const int num_dims, int * const dims, \ + int OP##_arrays (const cGH * const cgh, const int proc, \ + const int num_dims, const int * const dims, \ const int num_inarrays, \ - void ** const inarrays, const int intype, \ + const void * const * const inarrays, const int intype, \ const int num_outvals, \ void * const outvals, const int outtype) \ { \ @@ -675,10 +675,10 @@ namespace CarpetReduce { &red); \ } \ \ - int OP##_GVs (cGH * const cgh, const int proc, \ + int OP##_GVs (const cGH * const cgh, const int proc, \ const int num_outvals, \ const int outtype, void * const outvals, \ - const int num_invars, int * const invars) \ + const int num_invars, const int * const invars) \ { \ const OP red; \ return ReduceGVs (cgh, proc, \ diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc index 0b2afa93a..a9205522a 100644 --- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc +++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc @@ -34,7 +34,7 @@ #include "ioflexio.hh" extern "C" { - static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.22 2003/02/28 10:09:47 schnetter Exp $"; + static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.23 2003/03/12 09:34:44 schnetter Exp $"; CCTK_FILEVERSION(Carpet_CarpetIOFlexIO_ioflexio_cc); } @@ -375,7 +375,7 @@ namespace CarpetIOFlexIO { - int InputGH (cGH* const cgh) { + int InputGH (const cGH* const cgh) { int retval = 0; for (int vindex=0; vindex<CCTK_NumVars(); ++vindex) { if (CheckForVariable(cgh, GetStringParameter("in3D_vars",""), vindex)) { @@ -390,7 +390,7 @@ namespace CarpetIOFlexIO { - int InputVarAs (cGH* const cgh, const char* const varname, + int InputVarAs (const cGH* const cgh, const char* const varname, const char* const alias) { DECLARE_CCTK_PARAMETERS; diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh index 123869dbd..042fed5cb 100644 --- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh +++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh @@ -1,4 +1,4 @@ -// $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh,v 1.5 2002/09/01 14:52:26 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.hh,v 1.6 2003/03/12 09:34:44 schnetter Exp $ #ifndef CARPETIOFLEXIO_HH #define CARPETIOFLEXIO_HH @@ -27,8 +27,8 @@ namespace CarpetIOFlexIO { int TimeToOutput (const cGH* const cgh, const int vindex); int TriggerOutput (const cGH* const cgh, const int vindex); - int InputGH (cGH* const cgh); - int InputVarAs (cGH* const cgh, const char* const varname, + int InputGH (const cGH* const cgh); + int InputVarAs (const cGH* const cgh, const char* const varname, const char* const alias); } // namespace CarpetIOFlexIO |