summaryrefslogtreecommitdiffstats
path: root/c++/src/H5Object.cpp
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2012-09-28 22:18:33 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2012-09-28 22:18:33 (GMT)
commit9c3f82fbd762af5711ce11e394fed4360156c5af (patch)
tree305e340b8fda154db0a5905816ec7a3141dce8e1 /c++/src/H5Object.cpp
parent51bb0fe2d2d03b5744d0358f379ec3139090503c (diff)
downloadhdf5-9c3f82fbd762af5711ce11e394fed4360156c5af.zip
hdf5-9c3f82fbd762af5711ce11e394fed4360156c5af.tar.gz
hdf5-9c3f82fbd762af5711ce11e394fed4360156c5af.tar.bz2
[svn-r22845] Purpose: Misc fixes
Description: Fixed miscellaneous inconsistencies and typos, which also took care of the failure in Packet Table test on daily test today. Platforms tested: Linux/32 2.6 (jam) Linux/64 2.6 (koala) Mac Lion (duck)
Diffstat (limited to 'c++/src/H5Object.cpp')
-rw-r--r--c++/src/H5Object.cpp21
1 files changed, 1 insertions, 20 deletions
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp
index 1fdaf3f..e29e80e 100644
--- a/c++/src/H5Object.cpp
+++ b/c++/src/H5Object.cpp
@@ -37,30 +37,11 @@ namespace H5 {
#endif
#ifndef DOXYGEN_SHOULD_SKIP_THIS
-// userAttrOpWrpr simply interfaces between the user's function and the
-// C library function H5Aiterate2; used to resolve the different prototype
-// problem. May be moved to Iterator later.
-extern "C" herr_t userAttrOpWrpr1(hid_t loc_id, const char *attr_name,
- const H5A_info_t *ainfo, void *op_data)
-{
- H5std_string s_attr_name = H5std_string( attr_name );
-#ifdef NO_STATIC_CAST
- UserData4Aiterate* myData = (UserData4Aiterate *) op_data;
-#else
- UserData4Aiterate* myData = static_cast <UserData4Aiterate *> (op_data);
-#endif
- myData->op( *myData->location, s_attr_name, myData->opData );
- return 0;
-}
-
//--------------------------------------------------------------------------
// Function: H5Object default constructor (protected)
-// Description
-// The id is set by H5Location() but subclass constructor will
-// set it to a valid HDF5 id.
// Programmer Binh-Minh Ribler - 2000
//--------------------------------------------------------------------------
-H5Object::H5Object() : H5Location(0) {}
+H5Object::H5Object() : H5Location() {}
//--------------------------------------------------------------------------
// Function: H5Object overloaded constructor (protected)