mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2025-03-19 16:50:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r14147] Description:

Browse Source 
Clean up some "WANT_H5_V1_4_COMPAT" #ifdefs that somehow survived this
far...

Tested on:
	FreeBSD/32 6.2 (duty)
This commit is contained in:
Quincey Koziol 2007-09-13 13:32:01 -05:00
parent 27a1a10fbb
commit be12aa63a0
2 changed files with 0 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
c++/src/H5IdComponent.cpp
View File

@ -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);
}

4
tools/h5dump/h5dumpgentest.c
View File

@ -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);