Merge branch 'develop' into hdf5_1_10

1 files changed, 9 insertions, 8 deletions

diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp
index 865d04f..3eed168 100644
--- a/c++/src/H5Object.cpp
+++ b/c++/src/H5Object.cpp
@@ -44,10 +44,10 @@ namespace H5 {
 extern "C" herr_t userAttrOpWrpr(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);
-   UserData4Aiterate* myData = reinterpret_cast<UserData4Aiterate *> (op_data);
-   myData->op(*myData->location, s_attr_name, myData->opData);
-   return 0;
+    H5std_string s_attr_name = H5std_string(attr_name);
+    UserData4Aiterate* myData = reinterpret_cast<UserData4Aiterate *> (op_data);
+    myData->op(*myData->location, s_attr_name, myData->opData);
+    return 0;
 }
 
 //--------------------------------------------------------------------------
@@ -81,6 +81,7 @@ H5Object::H5Object() : H5Location() {}
 // This constructor is no longer appropriate because the data member "id" had
 // been moved to the sub-classes.  It is removed from 1.8.15 because it is
 // a noop and it can be generated by the compiler if needed.
+// Removed in 1.10.1 - Aug 2016
 //--------------------------------------------------------------------------
 // H5Object::H5Object(const H5Object& original) : H5Location() {}
 
@@ -148,7 +149,7 @@ Attribute H5Object::createAttribute(const char* name, const DataType& data_type,
 //--------------------------------------------------------------------------
 Attribute H5Object::createAttribute(const H5std_string& name, const DataType& data_type, const DataSpace& data_space, const PropList& create_plist) const
 {
-    return(createAttribute( name.c_str(), data_type, data_space, create_plist));
+    return(createAttribute(name.c_str(), data_type, data_space, create_plist));
 }
 
 //--------------------------------------------------------------------------
@@ -183,7 +184,7 @@ Attribute H5Object::openAttribute(const char* name) const
 //--------------------------------------------------------------------------
 Attribute H5Object::openAttribute(const H5std_string& name) const
 {
-    return(openAttribute( name.c_str()));
+    return(openAttribute(name.c_str()));
 }
 
 //--------------------------------------------------------------------------
@@ -239,7 +240,7 @@ int H5Object::iterateAttrs(attr_operator_t user_op, unsigned *_idx, void *op_dat
     // call the C library routine H5Aiterate2 to iterate the attributes
     hsize_t idx = _idx ? static_cast<hsize_t>(*_idx) : 0;
     int ret_value = H5Aiterate2(getId(), H5_INDEX_NAME, H5_ITER_INC, &idx,
-                         userAttrOpWrpr, reinterpret_cast<void *>(userData));
+                         userAttrOpWrpr, static_cast<void *>(userData));
 
     // release memory
     delete userData;
@@ -390,7 +391,6 @@ void H5Object::renameAttr(const H5std_string& oldname, const H5std_string& newna
     renameAttr (oldname.c_str(), newname.c_str());
 }
 
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
 // Function:    getObjName
 ///\brief       Given an id, returns the type of the object.
@@ -502,6 +502,7 @@ ssize_t H5Object::getObjName(H5std_string& obj_name, size_t len) const
     return(name_size);
 }
 
+#ifndef DOXYGEN_SHOULD_SKIP_THIS
 //--------------------------------------------------------------------------
 // Function:    H5Object destructor
 ///\brief       Noop destructor.