diff options
| author | Elena Pourmal <epourmal@hdfgroup.org> | 2007-03-02 14:21:36 (GMT) |
|---|---|---|
| committer | Elena Pourmal <epourmal@hdfgroup.org> | 2007-03-02 14:21:36 (GMT) |
| commit | ec412665853c302e55f87c4b69314c597b2054fd (patch) | |
| tree | 249e19e77ceaebe37e15f7b69f6ad09ceca57ada | |
| parent | a0d5e09775b83e851386710fb563ffee70210c28 (diff) | |
| download | hdf5-ec412665853c302e55f87c4b69314c597b2054fd.zip hdf5-ec412665853c302e55f87c4b69314c597b2054fd.tar.gz hdf5-ec412665853c302e55f87c4b69314c597b2054fd.tar.bz2 | |
[svn-r13442] H5system.c file didn't include H5MMprivate.h; that caused warnings on VMS; fixed
tfilter.cpp compilation failed on VMS; fixed by casting filter_bogus to (H5Z_func_t)
Platforms tested:
kagiso, VMS server
| -rw-r--r-- | c++/test/tfilter.cpp | 2 | ||||
| -rw-r--r-- | src/H5system.c | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp index 3eac80b..56fc999 100644 --- a/c++/test/tfilter.cpp +++ b/c++/test/tfilter.cpp @@ -66,7 +66,7 @@ const H5Z_class_t H5Z_BOGUS[1] = {{ "bogus", /* Filter name for debugging */ NULL, /* The "can apply" callback */ NULL, /* The "set local" callback */ - filter_bogus, /* The actual filter function */ + (H5Z_func_t)filter_bogus, /* The actual filter function */ }}; /*------------------------------------------------------------------------- diff --git a/src/H5system.c b/src/H5system.c index 63ef9aa..5eae11d 100644 --- a/src/H5system.c +++ b/src/H5system.c @@ -34,6 +34,7 @@ /***********/ #include "H5private.h" /* Generic Functions */ #include "H5Fprivate.h" /* File access */ +#include "H5MMprivate.h" /* Memory management */ /****************/ @@ -564,7 +565,7 @@ HDremove_all(const char *fname) int ret_value = -1; char *_fname; - _fname = H5MM_malloc(HDstrlen(fname) + 3); /* to accomodate ;* and null */ + _fname = (char *)H5MM_malloc(HDstrlen(fname) + 3); /* to accomodate ;* and null */ if(_fname) { HDstrcpy(_fname, fname); HDstrcat(_fname,";*"); |