diff options
| -rw-r--r-- | c++/src/H5IdComponent.cpp | 8 | ||||
| -rw-r--r-- | tools/h5dump/h5dumpgentest.c | 4 |
2 files changed, 0 insertions, 12 deletions
diff --git a/c++/src/H5IdComponent.cpp b/c++/src/H5IdComponent.cpp index 8fc8f30..249c66c 100644 --- a/c++/src/H5IdComponent.cpp +++ b/c++/src/H5IdComponent.cpp @@ -452,19 +452,11 @@ void IdComponent::dereference(IdComponent& obj, void* ref) //-------------------------------------------------------------------------- H5G_obj_t IdComponent::p_get_obj_type(void *ref, H5R_type_t ref_type) const { -#ifdef H5_WANT_H5_V1_4_COMPAT - H5G_obj_t obj_type = H5Rget_object_type(id, ref); -#else H5G_obj_t obj_type = H5Rget_obj_type(id, ref_type, ref); -#endif if (obj_type == H5G_UNKNOWN) { -#ifdef H5_WANT_H5_V1_4_COMPAT - throw IdComponentException("", "H5Rget_object_type failed"); -#else throw IdComponentException("", "H5Rget_obj_type failed"); -#endif } return(obj_type); } diff --git a/tools/h5dump/h5dumpgentest.c b/tools/h5dump/h5dumpgentest.c index e6d0d6d..ec1b65c 100644 --- a/tools/h5dump/h5dumpgentest.c +++ b/tools/h5dump/h5dumpgentest.c @@ -4848,11 +4848,7 @@ static void gent_filters(void) ret=H5Premove_filter(dcpl,H5Z_FILTER_ALL); assert(ret>=0); -#ifdef H5_WANT_H5_V1_4_COMPAT - ret=H5Zregister (MYFILTER_ID, "myfilter", myfilter); -#else ret=H5Zregister (H5Z_MYFILTER); -#endif assert(ret>=0); ret=H5Pset_filter (dcpl, MYFILTER_ID, 0, 0, NULL); |