Trying to get Carpet const-correct under various compilers. This

Trying to get Carpet const-correct under various compilers.  This
time, on SGIs.

darcs-hash:20011102150503-07bb3-896f54be90f36719c0cfeadadbf5bfb04d2efdea.gz

4 files changed, 10 insertions, 11 deletions

diff --git a/Carpet/Carpet/src/SetupGH.cc b/Carpet/Carpet/src/SetupGH.cc
index 432638062..e1cb5cd2f 100644
--- a/Carpet/Carpet/src/SetupGH.cc
+++ b/Carpet/Carpet/src/SetupGH.cc
@@ -10,7 +10,7 @@
 
 #include "carpet.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.8 2001/11/02 10:58:59 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/SetupGH.cc,v 1.9 2001/11/02 16:05:03 schnetter Exp $";
 
 
 
@@ -20,7 +20,7 @@ namespace Carpet {
   
   
   
-  void* SetupGH (const tFleshConfig* fc, int convLevel, cGH* cgh)
+  void* SetupGH (tFleshConfig* fc, int convLevel, cGH* cgh)
   {
     DECLARE_CCTK_PARAMETERS;
     
diff --git a/Carpet/Carpet/src/carpet_public.hh b/Carpet/Carpet/src/carpet_public.hh
index aafcef1e7..719147350 100644
--- a/Carpet/Carpet/src/carpet_public.hh
+++ b/Carpet/Carpet/src/carpet_public.hh
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet_public.hh,v 1.3 2001/11/02 10:59:00 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/Carpet/src/carpet_public.hh,v 1.4 2001/11/02 16:05:03 schnetter Exp $
 
 // It is assumed that the number of components of all arrays is equal
 // to the number of components of the grid functions, and that their
@@ -91,7 +91,7 @@ namespace Carpet {
   
   
   // Registered functions
-  void* SetupGH (const tFleshConfig* fc, int convLevel, cGH* cgh);
+  void* SetupGH (tFleshConfig* fc, int convLevel, cGH* cgh);
   
   int Initialise (tFleshConfig* config);
   int Evolve (const tFleshConfig* config);
diff --git a/Carpet/CarpetIOASCII/src/ioascii.cc b/Carpet/CarpetIOASCII/src/ioascii.cc
index 8d1b8d18f..997d96c24 100644
--- a/Carpet/CarpetIOASCII/src/ioascii.cc
+++ b/Carpet/CarpetIOASCII/src/ioascii.cc
@@ -24,7 +24,7 @@
 
 #include "ioascii.hh"
 
-static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.17 2001/11/02 10:59:01 schnetter Exp $";
+static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.cc,v 1.18 2001/11/02 16:05:04 schnetter Exp $";
 
 
 
@@ -85,8 +85,7 @@ int CarpetIOASCII<outdim>::Startup()
 
 template<int outdim>
 void* CarpetIOASCII<outdim>
-::SetupGH (const tFleshConfig* const fc, const int convLevel,
-	   const cGH* const cgh)
+::SetupGH (tFleshConfig* const fc, const int convLevel, const cGH* const cgh)
 {
   DECLARE_CCTK_PARAMETERS;
   
@@ -368,7 +367,7 @@ int CarpetIOASCII<outdim>
 
 template<int outdim>
 int CarpetIOASCII<outdim>
-::TimeToOutput (const cGH* const cgh, const int vindex)
+::TimeToOutput (cGH* const cgh, const int vindex)
 {
   DECLARE_CCTK_PARAMETERS;
   
diff --git a/Carpet/CarpetIOASCII/src/ioascii.hh b/Carpet/CarpetIOASCII/src/ioascii.hh
index 2be5195e2..2c56b6316 100644
--- a/Carpet/CarpetIOASCII/src/ioascii.hh
+++ b/Carpet/CarpetIOASCII/src/ioascii.hh
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.hh,v 1.6 2001/11/02 10:59:02 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.hh,v 1.7 2001/11/02 16:05:04 schnetter Exp $
 
 #include <vector>
 
@@ -45,11 +45,11 @@ struct CarpetIOASCII {
   
   // registered functions
   
-  static void* SetupGH (const tFleshConfig* fc, int convLevel, const cGH* cgh);
+  static void* SetupGH (tFleshConfig* fc, int convLevel, const cGH* cgh);
   
   static int OutputGH (cGH* cgh);
   static int OutputVarAs (cGH* cgh, const char* varname, const char* alias);
-  static int TimeToOutput (const cGH* cgh, int vindex);
+  static int TimeToOutput (cGH* cgh, int vindex);
   static int TriggerOutput (cGH* cgh, int vindex);
   
   static int GetGridOffset (const cGH* cgh, int dir,