From ec412665853c302e55f87c4b69314c597b2054fd Mon Sep 17 00:00:00 2001 From: Elena Pourmal Date: Fri, 2 Mar 2007 09:21:36 -0500 Subject: [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 --- c++/test/tfilter.cpp | 2 +- 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,";*"); -- cgit v0.12