diff options
| author | schnetter <schnetter@21a6bef8-4479-4f54-8f8d-0db94a2919ef> | 2009-09-29 14:34:45 +0000 |
|---|---|---|
| committer | schnetter <schnetter@21a6bef8-4479-4f54-8f8d-0db94a2919ef> | 2009-09-29 14:34:45 +0000 |
| commit | 674d0b2338744e55880714400579a6d04a8b7de7 (patch) | |
| tree | af93f259b0356321bb69fd40612804c9f5de055d | |
| parent | 57e48b39dcf8093733b4a8705c5d74aec7bc9bcc (diff) | |
git-svn-id: http://svn.cactuscode.org/arrangements/CactusExternal/FlexIO/trunk@100 21a6bef8-4479-4f54-8f8d-0db94a2919ef
| -rw-r--r-- | src/AmrUcdGridHierarchy.cc | 2 | ||||
| -rw-r--r-- | src/ioconvert.cc | 3 | ||||
| -rw-r--r-- | src/ioinfo.cc | 5 | ||||
| -rw-r--r-- | src/testallocation.cc | 4 |
4 files changed, 10 insertions, 4 deletions
diff --git a/src/AmrUcdGridHierarchy.cc b/src/AmrUcdGridHierarchy.cc index 479e9ef..60f4cf9 100644 --- a/src/AmrUcdGridHierarchy.cc +++ b/src/AmrUcdGridHierarchy.cc @@ -19,7 +19,7 @@ void AmrUcdGridHierarchy::AmrUcdGrid::copyFromAmrGrid(AmrGrid &g){ switch(datatype){ case IObase::Float32: printf("AmrUcdGridHierarchy:: Original data is float use directly\n"); - printf("\tpointerbase=%lu last=%lu\n",data,(data+nelements)); + printf("\tpointerbase=%p last=%p\n",data,(data+nelements)); //data=(float*)g.data; for(i=0;i<nelements;i++) data[i]=(float)((float*)(g.data))[i]; break; diff --git a/src/ioconvert.cc b/src/ioconvert.cc index cef2612..d61ffa8 100644 --- a/src/ioconvert.cc +++ b/src/ioconvert.cc @@ -12,6 +12,9 @@ #include "H5IO.hh" #endif +// dummy routine +extern "C" void CCTKi_RegisterThorn() {} + char *programname; void usage(){ printf("Correct usage is %s <infile> <outfile> [-swapbytes]\n",programname); diff --git a/src/ioinfo.cc b/src/ioinfo.cc index d813662..99ca6b9 100644 --- a/src/ioinfo.cc +++ b/src/ioinfo.cc @@ -11,6 +11,9 @@ #include "H5IO.hh" #endif +// dummy routine +extern "C" void CCTKi_RegisterThorn() {} + struct CmdlnParams { char *programname; char *filename,*filetype; @@ -252,7 +255,7 @@ int main(int argc,char *argv[]){ case IObase::Int64:{ Long8 *d=(Long8*)dataptr; for(int k=0;k<cmdln.showattribmax && k<length;k++) - printf("\t%s[%u]:=%lu\n",attribname,k,d[k]); + printf("\t%s[%u]:=%lu\n",attribname,k,(long unsigned int)d[k]); }break; case IObase::Float32:{ float *d=(float*)dataptr; diff --git a/src/testallocation.cc b/src/testallocation.cc index 75bc48c..7d3accc 100644 --- a/src/testallocation.cc +++ b/src/testallocation.cc @@ -16,11 +16,11 @@ struct InnerContainer { return *this; } InnerContainer(){ - printf("\tNew InnerContainer %lu\n",(unsigned long)this); + printf("\tNew InnerContainer %p\n",this); num=-1; /* uninitialized */ } ~InnerContainer(){ - printf("\tInnerContainer[%lu] destruct %d\n",(unsigned long)this,num); + printf("\tInnerContainer[%p] destruct %d\n",this,num); } }; |