Merge pull request #71 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_cppapi:develop to develop

Merged in
- added titerate.cpp to MANIFEST
- moved H5Location::throwException to outside of an H5_NO_DEPRECATED_SYMBOLS block to fix daily test failure.

* commit '78e597427c6ffc32ed7cf515234c4cf18d05004f':
  Description:     Fixed typo that caused daily test failed when --enable-deprecated-symbols     is used.  Also, removed a commented-out function. Platforms tested:     Linux/32 2.6 (jam)     Linux/64 (platypus) with --enable-deprecated-symbols
  Description:     Added test file titerate.cpp. Platform tested:     Verified with bin/chkmanifest

3 files changed, 4 insertions, 6 deletions

diff --git a/MANIFEST b/MANIFEST
index 98ecdb5..da3530b 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -415,6 +415,7 @@
 ./c++/test/tfilter.cpp
 ./c++/test/th5s.cpp
 ./c++/test/th5s.h5
+./c++/test/titerate.cpp
 ./c++/test/tlinks.cpp
 ./c++/test/tobject.cpp
 ./c++/test/ttypes.cpp
diff --git a/c++/src/H5Location.cpp b/c++/src/H5Location.cpp
index 334389e..6b5c63a 100644
--- a/c++/src/H5Location.cpp
+++ b/c++/src/H5Location.cpp
@@ -1885,6 +1885,9 @@ H5G_obj_t H5Location::getObjTypeByIdx(hsize_t idx, H5std_string& type_name) cons
     return (obj_type);
 }
 
+#endif // DOXYGEN_SHOULD_SKIP_THIS
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+
 //--------------------------------------------------------------------------
 // Function:    H5Location::throwException
 ///\brief       Invokes subclass' throwException
@@ -1898,9 +1901,6 @@ void H5Location::throwException(const H5std_string& func_name, const H5std_strin
    throwException(func_name, msg);
 }
 
-#endif // DOXYGEN_SHOULD_SKIP_THIS
-#endif /* H5_NO_DEPRECATED_SYMBOLS */
-
 //--------------------------------------------------------------------------
 // Function:    f_DataType_setId - friend
 // Purpose:     This function is friend to class H5::DataType so that it
diff --git a/c++/src/H5Location.h b/c++/src/H5Location.h
index 9ab67d3..bd8075c 100644
--- a/c++/src/H5Location.h
+++ b/c++/src/H5Location.h
@@ -208,9 +208,6 @@ class H5_DLLCPP H5Location : public IdComponent {
 
 // end From CommonFG
 
-	///\brief Returns an identifier.
-	//virtual hid_t getId() const;
-
 	/// For subclasses, H5File and Group, to throw appropriate exception.
 	virtual void throwException(const H5std_string& func_name, const H5std_string& msg) const;