summaryrefslogtreecommitdiff
path: root/src/include
diff options
context:
space:
mode:
authorlanfer <lanfer@17b73243-c579-4c4c-a9d2-2d5706c11dac>2000-03-07 09:36:30 +0000
committerlanfer <lanfer@17b73243-c579-4c4c-a9d2-2d5706c11dac>2000-03-07 09:36:30 +0000
commit10f8937419a53c7c67f8f0829722340d20d6d068 (patch)
tree5fa396f47a418ccd48a67ba520e79635bbf2967f /src/include
parentd2c230e25a5dc3b6466266d7d4a43acfe8d103be (diff)
CCTK_FREE/CCTK_MALLOC
git-svn-id: http://svn.cactuscode.org/flesh/trunk@1426 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'src/include')
-rw-r--r--src/include/cctk.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/include/cctk.h b/src/include/cctk.h
index 7d24e97c..2f1e4c7b 100644
--- a/src/include/cctk.h
+++ b/src/include/cctk.h
@@ -98,6 +98,7 @@
#include "cctk_Parameter.h"
#include "cctk_Reduction.h"
#include "cctk_WarnLevel.h"
+#include "cctk_MemAlloc.h"
#define CCTK_GFINDEX3D(GH,i,j,k) ((i) + (GH)->cctk_lsh[0]*((j)+(GH)->cctk_lsh[1]*(k)))
#define CCTK_GFINDEX2D(GH,i,j) ((i) + (GH)->cctk_lsh[0]*((j)))
@@ -200,6 +201,9 @@ extern int _cctk_one;
#define CCTK_WARN(a,b) CCTK_Warn(a,__LINE__,__FILE__,CCTK_THORNSTRING,b)
+#define CCTK_MALLOC(s) CCTKi_malloc(s,__LINE__,__FILE__)
+#define CCTK_FREE(p) CCTKi_free(p)
+
#define CCTKi_EXPCTERR(in,err,warnonerr,message) CCTKi_ExpectError(in,err,warnonerr,__LINE__,__FORTRANFILE__,CCTK_THORNSTRING,message)
#define CCTKi_EXPCTOK(in,ok,onerr,message) CCTKi_ExpectOK(in,ok,warnonerr,__LINE__,__FORTRANFILE__,CCTK_THORNSTRING,message)