diff options
| author | schnetter <> | 2002-09-01 12:52:00 +0000 |
|---|---|---|
| committer | schnetter <> | 2002-09-01 12:52:00 +0000 |
| commit | e3dfaf676fd1f5a1958a2ced3c699628721ab394 (patch) | |
| tree | 1322ea44bb2531839bd4729d1d62a3ebcf256f4a /Carpet/CarpetIOASCII/src | |
| parent | 4fd723849052d46936f9772d3a971809b6aadb6f (diff) | |
Fixed quite a few include guard mishaps.
darcs-hash:20020901125223-07bb3-f494618480c1ffc46118365c4c957d7a313d7be9.gz
Diffstat (limited to 'Carpet/CarpetIOASCII/src')
| -rw-r--r-- | Carpet/CarpetIOASCII/src/ioascii.h | 15 | ||||
| -rw-r--r-- | Carpet/CarpetIOASCII/src/ioascii.hh | 9 |
2 files changed, 12 insertions, 12 deletions
diff --git a/Carpet/CarpetIOASCII/src/ioascii.h b/Carpet/CarpetIOASCII/src/ioascii.h index a6aafba65..5e677843c 100644 --- a/Carpet/CarpetIOASCII/src/ioascii.h +++ b/Carpet/CarpetIOASCII/src/ioascii.h @@ -1,16 +1,19 @@ -/* $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.h,v 1.3 2002/09/01 14:37:45 schnetter Exp $ */ +/* $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.h,v 1.4 2002/09/01 14:52:25 schnetter Exp $ */ #ifndef CARPETIOASCII_H #define CARPETIOASCII_H #ifdef __cplusplus -extern "C" { +namespace CarpetIOASCII { + extern "C" { #endif - - int CarpetIOASCIIStartup (void); - + + /* Scheduled functions */ + int CarpetIOASCIIStartup (void); + #ifdef __cplusplus -} /* extern "C" */ + } /* extern "C" */ +} /* namespace CarpetIOASCII */ #endif #endif /* !defined(CARPETIOASCII_H) */ diff --git a/Carpet/CarpetIOASCII/src/ioascii.hh b/Carpet/CarpetIOASCII/src/ioascii.hh index d919c6341..504e7586f 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.12 2002/09/01 14:37:13 schnetter Exp $ +// $Header: /home/eschnett/C/carpet/Carpet/Carpet/CarpetIOASCII/src/ioascii.hh,v 1.13 2002/09/01 14:52:25 schnetter Exp $ #ifndef CARPETIOASCII_HH #define CARPETIOASCII_HH @@ -7,6 +7,8 @@ #include "cctk.h" +#include "ioascii.h" + namespace CarpetIOASCII { @@ -15,11 +17,6 @@ namespace CarpetIOASCII { - // scheduled functions -#include "ioascii.h" - - - // Everything is a class template, so that it can easily be // instantiated for all output dimensions. |