diff options
author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2014-03-23 21:30:43 (GMT) |
---|---|---|
committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2014-03-23 21:30:43 (GMT) |
commit | 74079aa0de09be6c57244bb4d33fcda51f7a2f4c (patch) | |
tree | ccce4a37a0a538d1a8871a3d2828e7f1f30746e4 /c++/src/H5File.h | |
parent | e18ee63c5a5c294d1949d83b1d34ae1fe15086ae (diff) | |
download | hdf5-74079aa0de09be6c57244bb4d33fcda51f7a2f4c.zip hdf5-74079aa0de09be6c57244bb4d33fcda51f7a2f4c.tar.gz hdf5-74079aa0de09be6c57244bb4d33fcda51f7a2f4c.tar.bz2 |
[svn-r24870] Description:
- Added another overload for char* argument:
ssize_t getComment(const char* name, const size_t buf_size, char* comment)
- Changed default value to 0 for the other two getComment methods
- Added HDmemset to after every char string allocation to clear the buffer
- Added a null terminator to the comment returned from the C call, in
getComment methods
- Some minor cleanup
Merged from trunk: -r24865 -r24867
Platforms tested:
Linux/ppc64 (ostrich)
Linux/32 2.6 (jam)
SunOS 5.11 (emu)
Diffstat (limited to 'c++/src/H5File.h')
-rw-r--r-- | c++/src/H5File.h | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/c++/src/H5File.h b/c++/src/H5File.h index 06b4fec..694d688 100644 --- a/c++/src/H5File.h +++ b/c++/src/H5File.h @@ -76,6 +76,7 @@ class H5_DLLCPP H5File : public H5Location, public CommonFG { // Reopens this file. void reOpen(); // added for better name + #ifndef DOXYGEN_SHOULD_SKIP_THIS void reopen(); // obsolete in favor of reOpen() @@ -102,6 +103,12 @@ class H5_DLLCPP H5File : public H5Location, public CommonFG { // H5File destructor. virtual ~H5File(); + protected: +#ifndef DOXYGEN_SHOULD_SKIP_THIS + // Sets the HDF5 file id. + virtual void p_setId(const hid_t new_id); +#endif // DOXYGEN_SHOULD_SKIP_THIS + private: hid_t id; // HDF5 file id @@ -109,13 +116,6 @@ class H5_DLLCPP H5File : public H5Location, public CommonFG { // constructors taking a string or a char* void p_get_file( const char* name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist ); - protected: -#ifndef DOXYGEN_SHOULD_SKIP_THIS - // Sets the HDF5 file id. - virtual void p_setId(const hid_t new_id); - -#endif // DOXYGEN_SHOULD_SKIP_THIS - }; #ifndef H5_NO_NAMESPACE } |