Follow C++ standard.

darcs-hash:20031121125546-07bb3-60338023244fbd0fab9d8663adff4cdf78e31141.gz

4 files changed, 13 insertions, 11 deletions

diff --git a/Carpet/CarpetLib/src/data.cc b/Carpet/CarpetLib/src/data.cc
index 63e0afeb1..468602265 100644
--- a/Carpet/CarpetLib/src/data.cc
+++ b/Carpet/CarpetLib/src/data.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/data.cc,v 1.35 2003/11/20 08:28:51 hawke Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/data.cc,v 1.36 2003/11/21 13:55:46 schnetter Exp $
 
 #include <assert.h>
 #include <limits.h>
@@ -107,7 +107,7 @@ void data<T,D>::transfer_from (gdata<D>* gsrc) {
   data* src = (data*)gsrc;
   assert (!_storage);
   *this = *src;
-  *src = data(varindex);
+  *src = data(this->varindex);
 }
 
 
@@ -273,7 +273,7 @@ void data<T,D>
   
   assert (this->proc() == src->proc());
 
-  const int groupindex = CCTK_GroupIndexFromVarI(varindex);
+  const int groupindex = CCTK_GroupIndexFromVarI(this->varindex);
   const int group_tags_table = CCTK_GroupTagsTableI(groupindex);
   assert (group_tags_table >= 0);
   
@@ -322,8 +322,8 @@ void data<T,D>
   MPI_Comm_rank (dist::comm, &rank);
   assert (rank == this->proc());
   
-  assert (varindex >= 0);
-  const int groupindex = CCTK_GroupIndexFromVarI (varindex);
+  assert (this->varindex >= 0);
+  const int groupindex = CCTK_GroupIndexFromVarI (this->varindex);
   assert (groupindex >= 0);
   char* groupname = CCTK_GroupName(groupindex);
   T Tdummy;
diff --git a/Carpet/CarpetLib/src/gdata.cc b/Carpet/CarpetLib/src/gdata.cc
index 4236b4b41..86537cea6 100644
--- a/Carpet/CarpetLib/src/gdata.cc
+++ b/Carpet/CarpetLib/src/gdata.cc
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gdata.cc,v 1.24 2003/11/05 16:18:39 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gdata.cc,v 1.25 2003/11/21 13:55:46 schnetter Exp $
 
 #include <assert.h>
 #include <stdlib.h>
@@ -68,7 +68,9 @@ gdata<D>::~gdata () { }
 
 // Transport operator types
 template<int D>
-gdata<D>::operator_type gdata<D>::find_transport_operator (const int varindex) {
+typename gdata<D>::operator_type
+gdata<D>::find_transport_operator (const int varindex)
+{
   const operator_type default_operator = op_Lagrange;
   if (varindex == -1) return op_error;
   assert (varindex >= 0);
diff --git a/Carpet/CarpetLib/src/gdata.hh b/Carpet/CarpetLib/src/gdata.hh
index 808a8eb51..37b544d7d 100644
--- a/Carpet/CarpetLib/src/gdata.hh
+++ b/Carpet/CarpetLib/src/gdata.hh
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gdata.hh,v 1.20 2003/11/05 16:18:39 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gdata.hh,v 1.21 2003/11/21 13:55:46 schnetter Exp $
 
 #ifndef GDATA_HH
 #define GDATA_HH
@@ -150,7 +150,7 @@ public:
   // readonly
   operator_type transport_operator;
  private:
-  static operator_type find_transport_operator (const int varindex_);
+  static operator_type find_transport_operator (const int varindex);
   
   // Data manipulators
  public:
diff --git a/Carpet/CarpetLib/src/gf.hh b/Carpet/CarpetLib/src/gf.hh
index f8242528b..ee4ce684c 100644
--- a/Carpet/CarpetLib/src/gf.hh
+++ b/Carpet/CarpetLib/src/gf.hh
@@ -1,4 +1,4 @@
-// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gf.hh,v 1.9 2003/10/14 16:39:16 schnetter Exp $
+// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetLib/src/gf.hh,v 1.10 2003/11/21 13:55:46 schnetter Exp $
 
 #ifndef GF_HH
 #define GF_HH
@@ -55,7 +55,7 @@ public:
   
 protected:
   
-  virtual gdata<D>* typed_data() { return new data<T,D>(varindex); }
+  virtual gdata<D>* typed_data() { return new data<T,D>(this->varindex); }