summaryrefslogtreecommitdiffstats
path: root/c++/src/H5Group.cpp
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-03-28 14:36:31 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-03-28 14:36:31 (GMT)
commit09f8d2f37ef0944c4cc3d3337966be9616266887 (patch)
tree57217c271571a89e4d5e02d69f9f4de7be7fcf03 /c++/src/H5Group.cpp
parentfc51d5a1a7919e12bd1864570d33a5c242b06163 (diff)
parentbe028580c8789301e4106d8d6e79a8fc8300e706 (diff)
downloadhdf5-09f8d2f37ef0944c4cc3d3337966be9616266887.zip
hdf5-09f8d2f37ef0944c4cc3d3337966be9616266887.tar.gz
hdf5-09f8d2f37ef0944c4cc3d3337966be9616266887.tar.bz2
Merge pull request #4 in ~BYRN/hdf5_adb from develop to bugfix/HDFFV-10143-programmatic-setting-plugin-path
* commit 'be028580c8789301e4106d8d6e79a8fc8300e706': Update with extra checks for reference Update cdash max test output and VS version matching Stop skipping h5watch tests. Add H5_DLL to H5AC_get_mdc_image_info() prototype Update RELEASE.txt based on review comments from pull request. Description: Removed notes about the C++ API in develop. Only keep in 1.10 branch. Add prototype for H5AC_get_mdc_image_info Minor style cleanups Revert "Switch h5clear for cache images to use existing H5Pget_cache_image_config()" Update RELEASE.txt to reflect changes for new features and bug fixes since 1.10.0-patch1. Run all scripts using signal files between processes in their own directories to avoid accidental deletion of the signal files. Remove extra space added by h5vers to version string in H5.java, which then failed to match the pattern after the first run. Remove incorrect " marks added to java files by bin/h5vers. Pull version from configure for version test in h5repack_plugin.sh.in Description: Fixed typos and missing items in function headers, that were revealed by Doxygen, and revised various comments. Platforms tested: Linux/32 2.6 (jam) Linux/64 (platypus) Darwin (osx1010test) Description: Updated the C++ API sections. Extend h5vers to update version strings in java files and h5repack version test expected output file. Add reference to CMake application framwork Whitespace changes Update notes Run swmr tests in their own subdirectory of test to avoid signal file deletion by other tests.
Diffstat (limited to 'c++/src/H5Group.cpp')
-rw-r--r--c++/src/H5Group.cpp23
1 files changed, 16 insertions, 7 deletions
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp
index bb9e05d..66e2339 100644
--- a/c++/src/H5Group.cpp
+++ b/c++/src/H5Group.cpp
@@ -66,6 +66,9 @@ Group::Group(const Group& original) : H5Object(), CommonFG(), id(original.id)
//--------------------------------------------------------------------------
// Function: Group::getObjId
///\brief Opens an object via object header.
+///\param obj_name - IN: Path to the object
+///\param plist - IN: Access property list for the link pointing to
+/// the object
///\exception H5::FileIException or H5::GroupIException
///\par Description
/// This function opens an object in a group or file, using
@@ -88,6 +91,8 @@ hid_t Group::getObjId(const char* obj_name, const PropList& plist) const
///\brief This is an overloaded member function, provided for convenience.
/// It takes a reference to a \c H5std_string for the object's name.
///\param obj_name - IN: Path to the object
+///\param plist - IN: Access property list for the link pointing to
+/// the object
///\exception H5::FileIException or H5::GroupIException
// Programmer Binh-Minh Ribler - March, 2017
//--------------------------------------------------------------------------
@@ -159,15 +164,19 @@ Group::Group(const H5Location& loc, const void* ref, H5R_type_t ref_type, const
//--------------------------------------------------------------------------
// Function: Group overload constructor - dereference
-///\brief Given a reference, ref, to an hdf5 group, creates a Group object
-///\param attr - IN: Specifying location where the referenced object is in
-///\param ref - IN: Reference pointer
-///\param ref_type - IN: Reference type - default to H5R_OBJECT
-///\param plist - IN: Property list - default to PropList::DEFAULT
-///\exception H5::ReferenceException
+// brief Given a reference, ref, to an hdf5 group, creates a Group objec
+// param attr - IN: Specifying location where the referenced object is i
+// param ref - IN: Reference pointer
+// param ref_type - IN: Reference type - default to H5R_OBJECT
+// param plist - IN: Property list - default to PropList::DEFAULT
+// exception H5::ReferenceException
// Programmer Binh-Minh Ribler - Oct, 2006
+// Modification
+// Mar, 2017
+// Removed in 1.10.1 because H5Location is Attribute's baseclass
+// now. -BMR
//--------------------------------------------------------------------------
- /* Group::Group(const Attribute& attr, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object(), id(H5I_INVALID_HID)
+/* Group::Group(const Attribute& attr, const void* ref, H5R_type_t ref_type, const PropList& plist) : H5Object(), id(H5I_INVALID_HID)
{
id = H5Location::p_dereference(attr.getId(), ref, ref_type, plist, "constructor - by dereference");
}