aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland Haas <rhaas@tapir.caltech.edu>2013-07-31 23:37:21 -0700
committerRoland Haas <rhaas@tapir.caltech.edu>2013-08-18 16:08:23 -0700
commit66a468f4fc38188cd7a71261234a073f2a3e8c73 (patch)
treeead092b9b4d349da7999cea2f9fc242d80c0e2d5
parentc02dd99bbded56ab4dee2477cbc045b65708420d (diff)
CarpetIOHDF5: remove two compiler warnings
-rw-r--r--Carpet/CarpetIOHDF5/src/Input.cc11
1 files changed, 6 insertions, 5 deletions
diff --git a/Carpet/CarpetIOHDF5/src/Input.cc b/Carpet/CarpetIOHDF5/src/Input.cc
index 9d1f77443..e3114e925 100644
--- a/Carpet/CarpetIOHDF5/src/Input.cc
+++ b/Carpet/CarpetIOHDF5/src/Input.cc
@@ -562,7 +562,8 @@ int Recover (cGH* cctkGH, const char *basefilename, int called_from)
assert (myGH->cp_filename_index == 0);
// add a dummy entry in the checkpoint filename ring buffer
- myGH->cp_filename_list[myGH->cp_filename_index] = (char*)"bla";
+ static char bla[] = "bla";
+ myGH->cp_filename_list[myGH->cp_filename_index] = bla;
myGH->cp_filename_index = (myGH->cp_filename_index+1) % checkpoint_keep;
}
}
@@ -1509,10 +1510,10 @@ static int ReadVar (const cGH* const cctkGH,
NULL, count, NULL));
HDF5_ERROR (H5Dread (dataset, datatype, memspace, filespace, xfer,
cctkGH->data[patch->vindex][timelevel]));
- hid_t datatype;
- HDF5_ERROR (datatype = H5Dget_type (dataset));
- io_bytes += H5Sget_select_npoints (filespace) * H5Tget_size (datatype);
- HDF5_ERROR (H5Tclose (datatype));
+ hid_t iodatatype;
+ HDF5_ERROR (iodatatype = H5Dget_type (dataset));
+ io_bytes += H5Sget_select_npoints (filespace) * H5Tget_size (iodatatype);
+ HDF5_ERROR (H5Tclose (iodatatype));
HDF5_ERROR (H5Sclose (memspace));
} END_LOCAL_COMPONENT_LOOP;