From e3dfaf676fd1f5a1958a2ced3c699628721ab394 Mon Sep 17 00:00:00 2001 From: schnetter <> Date: Sun, 1 Sep 2002 12:52:00 +0000 Subject: Fixed quite a few include guard mishaps. darcs-hash:20020901125223-07bb3-f494618480c1ffc46118365c4c957d7a313d7be9.gz --- Carpet/CarpetRegrid/src/regrid.hh | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'Carpet/CarpetRegrid/src/regrid.hh') diff --git a/Carpet/CarpetRegrid/src/regrid.hh b/Carpet/CarpetRegrid/src/regrid.hh index 661e1a2e9..a317a9cd4 100644 --- a/Carpet/CarpetRegrid/src/regrid.hh +++ b/Carpet/CarpetRegrid/src/regrid.hh @@ -1,7 +1,7 @@ -// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.hh,v 1.6 2002/05/16 23:25:54 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetRegrid/src/regrid.hh,v 1.7 2002/09/01 14:52:29 schnetter Exp $ -#ifndef REGRID_HH -#define REGRID_HH +#ifndef CARPETREGRID_HH +#define CARPETREGRID_HH #include @@ -12,6 +12,8 @@ #include "carpet.hh" +#include "regrid.h" + namespace CarpetRegrid { @@ -19,12 +21,6 @@ namespace CarpetRegrid { using namespace std; using namespace Carpet; - // scheduled functions - extern "C" { - int CarpetRegridStartup (); - int CarpetRegridParamcheck (CCTK_ARGUMENTS); - } - typedef vect ivect; @@ -70,4 +66,4 @@ namespace CarpetRegrid { } // namespace CarpetRegrid -#endif // ! defined(REGRID_HH) +#endif // !defined(CARPETREGRID_HH) -- cgit v1.2.3