From 4179f8206d2286869df4d40de8c1d2704b4f38f8 Mon Sep 17 00:00:00 2001
From: Erik Schnetter <schnetter@cct.lsu.edu>
Date: Tue, 27 Apr 2010 11:59:43 -0500
Subject: CarpetLib: Correct ggf::new_typed_data

---
 Carpet/CarpetLib/src/gdata.hh | 1 -
 Carpet/CarpetLib/src/gf.hh    | 3 ++-
 Carpet/CarpetLib/src/ggf.hh   | 3 ++-
 Carpet/CarpetLib/src/gh.cc    | 2 +-
 4 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/Carpet/CarpetLib/src/gdata.hh b/Carpet/CarpetLib/src/gdata.hh
index a36fbb84c..5a7f153e7 100644
--- a/Carpet/CarpetLib/src/gdata.hh
+++ b/Carpet/CarpetLib/src/gdata.hh
@@ -167,7 +167,6 @@ public:
                  int order_time);
   
 protected:
-  static
   void
   find_source_timelevel (vector <CCTK_REAL> const & times,
                          CCTK_REAL time,
diff --git a/Carpet/CarpetLib/src/gf.hh b/Carpet/CarpetLib/src/gf.hh
index 5685f228f..227c739bf 100644
--- a/Carpet/CarpetLib/src/gf.hh
+++ b/Carpet/CarpetLib/src/gf.hh
@@ -58,7 +58,8 @@ public:
                        vl);
   }
   
-  virtual gdata* new_typed_data () const
+  virtual gdata*
+  new_typed_data () const
   {
     return new data<T>(this->varindex,
                        h.refcent, this->transport_operator,
diff --git a/Carpet/CarpetLib/src/ggf.hh b/Carpet/CarpetLib/src/ggf.hh
index 5538f3941..3badcff14 100644
--- a/Carpet/CarpetLib/src/ggf.hh
+++ b/Carpet/CarpetLib/src/ggf.hh
@@ -150,7 +150,8 @@ public:
   
   virtual gdata* typed_data (int tl, int rl, int lc, int ml) const = 0;
   
-  virtual gdata* new_typed_data () const = 0;
+  virtual gdata*
+  new_typed_data () const = 0;
   
   
   
diff --git a/Carpet/CarpetLib/src/gh.cc b/Carpet/CarpetLib/src/gh.cc
index 22ac4ae06..52ed1cf60 100644
--- a/Carpet/CarpetLib/src/gh.cc
+++ b/Carpet/CarpetLib/src/gh.cc
@@ -347,7 +347,7 @@ locate_position (rvect const & rpos,
   assert (ml>=0 and ml<mglevels());
   assert (minrl>=0 and minrl<=maxrl and maxrl<=reflevels());
   
-  if (any(not CarpetLib::good::isfinite(rpos))) {
+  if (any(not isfinite(rpos))) {
     rl = -1;
     c = -1;
     return;
-- 
cgit v1.2.3