summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2016-10-12 19:21:57 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2016-10-12 19:21:57 (GMT)
commit78e597427c6ffc32ed7cf515234c4cf18d05004f (patch)
tree20a5709ba2f2e6aba054bec65b0799fa0ae31e5e
parent68055cea638cc3bb90a481e001161b8cb33ce087 (diff)
downloadhdf5-78e597427c6ffc32ed7cf515234c4cf18d05004f.zip
hdf5-78e597427c6ffc32ed7cf515234c4cf18d05004f.tar.gz
hdf5-78e597427c6ffc32ed7cf515234c4cf18d05004f.tar.bz2
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
-rw-r--r--c++/src/H5Location.cpp6
-rw-r--r--c++/src/H5Location.h3
2 files changed, 3 insertions, 6 deletions
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;