[svn-r14148] Description:

	Add H5Rget_obj_type() to the API versioning and switch internal
routines to use H5Rget_obj_type2()

	Misc. other code cleanups, etc.

Tested on:
        FreeBSD/32 6.2 (duty)
        FreeBSD/64 6.2 (liberty)
        Linux/32 2.6 (kagiso)
        Linux/64 2.6 (smirom)
        AIX/32 5.3 (copper)
        Solaris/32 2.10 (linew)
        Mac OS X/32 10.4.10 (amazon)

10 files changed, 21 insertions, 1 deletions

diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp
index 276bcdb..4d3050c 100644
--- a/c++/src/H5DataSet.cpp
+++ b/c++/src/H5DataSet.cpp
@@ -503,6 +503,7 @@ void* DataSet::Reference(const H5std_string& name) const
    return(Reference(name.c_str()));
 }
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 //--------------------------------------------------------------------------
 // Function:	DataSet::getObjType
 ///\brief	Retrieves the type of object that an object reference points to.
@@ -527,6 +528,7 @@ H5G_obj_t DataSet::getObjType(void *ref, H5R_type_t ref_type) const
       throw DataSetIException("DataSet::getObjType", E.getDetailMsg());
    }
 }
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 //--------------------------------------------------------------------------
 // Function:	DataSet::getRegion
diff --git a/c++/src/H5DataSet.h b/c++/src/H5DataSet.h
index 24e52ab..7323f52 100644
--- a/c++/src/H5DataSet.h
+++ b/c++/src/H5DataSet.h
@@ -73,8 +73,10 @@ class H5_DLLCPP DataSet : public AbstractDs {
 	// Iterates the selected elements in the specified dataspace - not implemented in C++ style yet
         int iterateElems( void* buf, const DataType& type, const DataSpace& space, H5D_operator_t op, void* op_data = NULL );
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 	// Retrieves the type of object that an object reference points to.
 	H5G_obj_t getObjType(void *ref, H5R_type_t ref_type = H5R_OBJECT) const;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 	// Retrieves a dataspace with the region pointed to selected.
 	DataSpace getRegion(void *ref, H5R_type_t ref_type = H5R_DATASET_REGION) const;
diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp
index 8ba91aa..1ac922e 100644
--- a/c++/src/H5DataType.cpp
+++ b/c++/src/H5DataType.cpp
@@ -664,6 +664,7 @@ void* DataType::Reference(const H5std_string& name) const
    return(Reference(name.c_str()));
 }
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 //--------------------------------------------------------------------------
 // Function:	DataType::getObjType
 ///\brief	Retrieves the type of object that an object reference points to.
@@ -686,6 +687,7 @@ H5G_obj_t DataType::getObjType(void *ref, H5R_type_t ref_type) const
       throw DataTypeIException(inMemFunc("getObjType"), E.getDetailMsg());
    }
 }
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 //--------------------------------------------------------------------------
 // Function:	DataType::getRegion
diff --git a/c++/src/H5DataType.h b/c++/src/H5DataType.h
index 425ad25..588a57a 100644
--- a/c++/src/H5DataType.h
+++ b/c++/src/H5DataType.h
@@ -107,8 +107,10 @@ class H5_DLLCPP DataType : public H5Object {
 	void* Reference(const char* name) const; // will be obsolete
 	void* Reference(const H5std_string& name) const; // will be obsolete
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 	// Retrieves the type of object that an object reference points to.
 	H5G_obj_t getObjType(void *ref, H5R_type_t ref_type = H5R_OBJECT) const;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 	// Retrieves a dataspace with the region pointed to selected.
 	DataSpace getRegion(void *ref, H5R_type_t ref_type = H5R_DATASET_REGION) const;
diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp
index 66cacb5..aa11e31 100644
--- a/c++/src/H5File.cpp
+++ b/c++/src/H5File.cpp
@@ -548,6 +548,7 @@ void* H5File::Reference(const H5std_string& name) const
    return(Reference(name.c_str()));
 }
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 //--------------------------------------------------------------------------
 // Function:	H5File::getObjType
 ///\brief	Retrieves the type of object that an object reference points to.
@@ -572,6 +573,7 @@ H5G_obj_t H5File::getObjType(void *ref, H5R_type_t ref_type) const
       throw FileIException("H5File::getObjType", E.getDetailMsg());
    }
 }
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 //--------------------------------------------------------------------------
 // Function:	H5File::getRegion
diff --git a/c++/src/H5File.h b/c++/src/H5File.h
index 30e148a..b239efe 100644
--- a/c++/src/H5File.h
+++ b/c++/src/H5File.h
@@ -67,8 +67,10 @@ class H5_DLLCPP H5File : public IdComponent, public CommonFG {
 	// and datatypes) in the same file.
 	void getObjIDs(unsigned types, int max_objs, hid_t *oid_list) const;
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 	// Retrieves the type of object that an object reference points to.
 	H5G_obj_t getObjType(void *ref, H5R_type_t ref_type = H5R_OBJECT) const;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 	// Retrieves a dataspace with the region pointed to selected.
 	DataSpace getRegion(void *ref, H5R_type_t ref_type = H5R_DATASET_REGION) const;
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp
index ae4675f..f3c058a 100644
--- a/c++/src/H5Group.cpp
+++ b/c++/src/H5Group.cpp
@@ -140,6 +140,7 @@ void* Group::Reference(const H5std_string& name) const
    return(Reference(name.c_str()));
 }
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 //--------------------------------------------------------------------------
 // Function:	Group::getObjType
 ///\brief	Retrieves the type of object that an object reference points to.
@@ -164,6 +165,7 @@ H5G_obj_t Group::getObjType(void *ref, H5R_type_t ref_type) const
       throw GroupIException("Group::getObjType", E.getDetailMsg());
    }
 }
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 //--------------------------------------------------------------------------
 // Function:	Group::getRegion
diff --git a/c++/src/H5Group.h b/c++/src/H5Group.h
index d7e7dec..5df85bb 100644
--- a/c++/src/H5Group.h
+++ b/c++/src/H5Group.h
@@ -26,8 +26,10 @@ class H5_DLLCPP Group : public H5Object, public CommonFG {
 	// Close this group.
 	virtual void close();
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 	// Retrieves the type of object that an object reference points to.
 	H5G_obj_t getObjType(void *ref, H5R_type_t ref_type = H5R_OBJECT) const;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 	// Retrieves a dataspace with the region pointed to selected.
 	DataSpace getRegion(void *ref, H5R_type_t ref_type = H5R_DATASET_REGION) const;
diff --git a/c++/src/H5IdComponent.cpp b/c++/src/H5IdComponent.cpp
index 249c66c..bb015fb 100644
--- a/c++/src/H5IdComponent.cpp
+++ b/c++/src/H5IdComponent.cpp
@@ -436,6 +436,7 @@ void IdComponent::dereference(IdComponent& obj, void* ref)
    }
 }
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 //--------------------------------------------------------------------------
 // Function:	IdComponent::p_get_obj_type (protected)
 // Purpose	Retrieves the type of object that an object reference points to.
@@ -452,7 +453,7 @@ void IdComponent::dereference(IdComponent& obj, void* ref)
 //--------------------------------------------------------------------------
 H5G_obj_t IdComponent::p_get_obj_type(void *ref, H5R_type_t ref_type) const
 {
-   H5G_obj_t obj_type = H5Rget_obj_type(id, ref_type, ref);
+   H5G_obj_t obj_type = H5Rget_obj_type1(id, ref_type, ref);
 
    if (obj_type == H5G_UNKNOWN)
    {
@@ -460,6 +461,7 @@ H5G_obj_t IdComponent::p_get_obj_type(void *ref, H5R_type_t ref_type) const
    }
    return(obj_type);
 }
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 //--------------------------------------------------------------------------
 // Function:	IdComponent::p_get_region (protected)
diff --git a/c++/src/H5IdComponent.h b/c++/src/H5IdComponent.h
index 503217b..facdefd 100644
--- a/c++/src/H5IdComponent.h
+++ b/c++/src/H5IdComponent.h
@@ -98,8 +98,10 @@ class H5_DLLCPP IdComponent {
 	void p_reference(void* ref, const char* name, hid_t space_id, H5R_type_t ref_type) const;
 	void* p_reference(const char* name, hid_t space_id, H5R_type_t ref_type) const; // will be removed
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 	// Retrieves the type of object that an object reference points to.
 	H5G_obj_t p_get_obj_type(void *ref, H5R_type_t ref_type) const;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 
 	// Retrieves a dataspace with the region pointed to selected.
 	hid_t p_get_region(void *ref, H5R_type_t ref_type) const;