summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBinh-Minh Ribler <bmribler@hdfgroup.org>2004-08-21 15:58:11 (GMT)
committerBinh-Minh Ribler <bmribler@hdfgroup.org>2004-08-21 15:58:11 (GMT)
commit1bc611b62313f64dd65345385007f38e2eaeec7d (patch)
tree4df05add949d91f982107fde8911a56249b45e10
parent1926a6538e52bb626be4411d52fd12eb4496a426 (diff)
downloadhdf5-1bc611b62313f64dd65345385007f38e2eaeec7d.zip
hdf5-1bc611b62313f64dd65345385007f38e2eaeec7d.tar.gz
hdf5-1bc611b62313f64dd65345385007f38e2eaeec7d.tar.bz2
[svn-r9133] Purpose: Clean up code
Description: The private function p_close was removed previously, but I inadvertently put it back in a few places, while transferring the changes from 1.6 branch. These are removed now. Platforms tested: SunOS 5.7 (arabica) Linux 2.4 (eirene)
-rw-r--r--c++/src/H5Attribute.cpp20
-rw-r--r--c++/src/H5Attribute.h5
-rw-r--r--c++/src/H5DataSpace.h5
-rw-r--r--c++/src/H5Group.cpp2
4 files changed, 1 insertions, 31 deletions
diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp
index 7b26947..6c9b1b3 100644
--- a/c++/src/H5Attribute.cpp
+++ b/c++/src/H5Attribute.cpp
@@ -256,26 +256,6 @@ string Attribute::getName() const
return( attr_name );
}
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
-//--------------------------------------------------------------------------
-// Function: Attribute::p_close (private)
-// Purpose: Closes this attribute.
-// Exception H5::AttributeIException
-// Description
-// This function will be obsolete because its functionality
-// is recently handled by the C library layer. - May, 2004
-// Programmer Binh-Minh Ribler - 2000
-//--------------------------------------------------------------------------
-void Attribute::p_close() const
-{
- herr_t ret_value = H5Aclose( id );
- if( ret_value < 0 )
- {
- throw AttributeIException(0, "H5Aclose failed");
- }
-}
-#endif // DOXYGEN_SHOULD_SKIP_THIS
-
//--------------------------------------------------------------------------
// Function: Attribute destructor
///\brief Properly terminates access to this attribute.
diff --git a/c++/src/H5Attribute.h b/c++/src/H5Attribute.h
index b18a6f0..8863a65 100644
--- a/c++/src/H5Attribute.h
+++ b/c++/src/H5Attribute.h
@@ -44,11 +44,6 @@ class H5_DLLCPP Attribute : public AbstractDs {
// Copy constructor: makes a copy of an existing Attribute object.
Attribute( const Attribute& original );
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
- // Used by the API to appropriately close an attribute
- virtual void p_close() const;
-#endif // DOXYGEN_SHOULD_SKIP_THIS
-
// Destructor: properly terminates access to this attribute.
virtual ~Attribute();
diff --git a/c++/src/H5DataSpace.h b/c++/src/H5DataSpace.h
index 5e20730..01fb40d 100644
--- a/c++/src/H5DataSpace.h
+++ b/c++/src/H5DataSpace.h
@@ -105,11 +105,6 @@ class H5_DLLCPP DataSpace : public IdComponent {
// Copy constructor: makes a copy of the original DataSpace object.
DataSpace(const DataSpace& original);
-#ifndef DOXYGEN_SHOULD_SKIP_THIS
- // Used by the API to close the dataspace
- void p_close() const;
-#endif // DOXYGEN_SHOULD_SKIP_THIS
-
// Destructor: properly terminates access to this dataspace.
virtual ~DataSpace();
};
diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp
index 71b034e..5a00922 100644
--- a/c++/src/H5Group.cpp
+++ b/c++/src/H5Group.cpp
@@ -173,7 +173,7 @@ Group::~Group()
try {
decRefCount();
}
- catch (Exception close_error) { // thrown by p_close
+ catch (Exception close_error) {
cerr << "Group::~Group - " << close_error.getDetailMsg() << endl;
}