aboutsummaryrefslogtreecommitdiff
path: root/CarpetAttic
diff options
context:
space:
mode:
authortradke <>2003-09-08 12:41:00 +0000
committertradke <>2003-09-08 12:41:00 +0000
commitd62565b26e8ce928fbb1e149f3c81a62cfd613ce (patch)
treeaa329ffee674f20c4c400168140fd0eacc240c26 /CarpetAttic
parenta89e0bb3beb18555c40f5b31f231857143faa8ac (diff)
Hack to stop FlexIO data type clash with LAM MPI.
darcs-hash:20030908124148-1d9bf-d1565620e6e88b5a5c0485a24f5e7cac8e5e6521.gz
Diffstat (limited to 'CarpetAttic')
-rw-r--r--CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc6
1 files changed, 5 insertions, 1 deletions
diff --git a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
index 813ddf882..ed90f28cc 100644
--- a/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
+++ b/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc
@@ -27,6 +27,10 @@
#include "IEEEIO.hh"
#include "IO.hh"
+// Hack to stop FlexIO data type clash with LAM MPI
+#undef BYTE
+#undef CHAR
+
#include "CactusBase/IOUtil/src/ioGH.h"
#include "bbox.hh"
@@ -40,7 +44,7 @@
#include "ioflexio.hh"
extern "C" {
- static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.30 2003/07/14 15:41:34 schnetter Exp $";
+ static const char* rcsid = "$Header: /home/eschnett/C/carpet/Carpet/CarpetAttic/CarpetIOFlexIO/src/ioflexio.cc,v 1.31 2003/09/08 14:41:48 tradke Exp $";
CCTK_FILEVERSION(Carpet_CarpetIOFlexIO_ioflexio_cc);
}