[svn-r14147] Description:

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

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