diff options
| -rw-r--r-- | c++/src/H5AtomType.h | 2 | ||||
| -rw-r--r-- | c++/src/H5DataSet.cpp | 15 | ||||
| -rw-r--r-- | c++/src/H5DataSet.h | 1 | ||||
| -rw-r--r-- | c++/src/H5DataType.h | 8 | ||||
| -rw-r--r-- | c++/src/H5FaccProp.cpp | 16 | ||||
| -rw-r--r-- | c++/src/H5PropList.h | 6 |
6 files changed, 31 insertions, 17 deletions
diff --git a/c++/src/H5AtomType.h b/c++/src/H5AtomType.h index d8a89c5..5d0627f 100644 --- a/c++/src/H5AtomType.h +++ b/c++/src/H5AtomType.h @@ -27,8 +27,8 @@ namespace H5 { class H5_DLLCPP AtomType : public DataType { public: // Returns the byte order of an atomic datatype. - H5T_order_t getOrder( string& order_string ) const; H5T_order_t getOrder() const; + H5T_order_t getOrder( string& order_string ) const; // Sets the byte ordering of an atomic datatype. void setOrder( H5T_order_t order ) const; diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp index c2d41de..3b2c5b3 100644 --- a/c++/src/H5DataSet.cpp +++ b/c++/src/H5DataSet.cpp @@ -426,7 +426,7 @@ void* DataSet::Reference(const char* name, DataSpace& dataspace, H5R_type_t ref_ ///\brief This is an overloaded function, provided for your convenience. /// It differs from the above function in that it only creates /// a reference to an HDF5 object, not to a dataset region. -///\param name - IN: Name of the object to be referenced +///\param name - IN: Name of the object to be referenced - \c char pointer ///\return A reference ///\exception H5::IdComponentException ///\par Description @@ -441,6 +441,19 @@ void* DataSet::Reference(const char* name) const } //-------------------------------------------------------------------------- +// Function: DataSet::Reference +///\brief This is an overloaded function, provided for your convenience. +/// It differs from the above function in that it takes an +/// \c std::string for the object's name. +///\param name - IN: Name of the object to be referenced - \c std::string +// Programmer Binh-Minh Ribler - May, 2004 +//-------------------------------------------------------------------------- +void* DataSet::Reference(const string& name) const +{ + return(Reference(name.c_str())); +} + +//-------------------------------------------------------------------------- // Function: DataSet::getObjType ///\brief Retrieves the type of object that an object reference points to. ///\param ref_type - IN: Type of reference to query diff --git a/c++/src/H5DataSet.h b/c++/src/H5DataSet.h index 7fc156b..d02e8e1 100644 --- a/c++/src/H5DataSet.h +++ b/c++/src/H5DataSet.h @@ -78,6 +78,7 @@ class H5_DLLCPP DataSet : public AbstractDs { // Creates a reference to a named Hdf5 object in this object. void* Reference(const char* name) const; + void* Reference(const string& name) const; // Returns this class name virtual string fromClass () const { return("DataSet"); } diff --git a/c++/src/H5DataType.h b/c++/src/H5DataType.h index f4bf0a4..b2a098f 100644 --- a/c++/src/H5DataType.h +++ b/c++/src/H5DataType.h @@ -39,8 +39,8 @@ class H5_DLLCPP DataType : public H5Object { // Commits a transient datatype to a file; this datatype becomes // a named datatype which can be accessed from the location. - void commit( CommonFG& loc, const string& name ) const; void commit( CommonFG& loc, const char* name ) const; + void commit( CommonFG& loc, const string& name ) const; // Determines whether this datatype is a named datatype or // a transient datatype. @@ -76,16 +76,16 @@ class H5_DLLCPP DataType : public H5Object { DataType getSuper() const; // Registers a conversion function. - void registerFunc(H5T_pers_t pers, const string& name, const DataType& dest, H5T_conv_t func ) const; void registerFunc(H5T_pers_t pers, const char* name, const DataType& dest, H5T_conv_t func ) const; + void registerFunc(H5T_pers_t pers, const string& name, const DataType& dest, H5T_conv_t func ) const; // Removes a conversion function from all conversion paths. - void unregister( H5T_pers_t pers, const string& name, const DataType& dest, H5T_conv_t func ) const; void unregister( H5T_pers_t pers, const char* name, const DataType& dest, H5T_conv_t func ) const; + void unregister( H5T_pers_t pers, const string& name, const DataType& dest, H5T_conv_t func ) const; // Tags an opaque datatype. - void setTag( const string& tag ) const; void setTag( const char* tag ) const; + void setTag( const string& tag ) const; // Gets the tag associated with an opaque datatype. string getTag() const; diff --git a/c++/src/H5FaccProp.cpp b/c++/src/H5FaccProp.cpp index 9a50b99..25c536f 100644 --- a/c++/src/H5FaccProp.cpp +++ b/c++/src/H5FaccProp.cpp @@ -31,14 +31,14 @@ const FileAccPropList FileAccPropList::DEFAULT; //-------------------------------------------------------------------------- // Function: Default Constructor -///\brief Default constructor: creates a file access property list +///\brief Default constructor: creates a file access property list // Programmer: Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FileAccPropList::FileAccPropList() : PropList( H5P_FILE_ACCESS ) {} //-------------------------------------------------------------------------- // Function: FileAccPropList copy constructor -///\brief Copy Constructor: makes a copy of the original +///\brief Copy Constructor: makes a copy of the original /// FileAccPropList object. // Programmer: Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- @@ -46,7 +46,7 @@ FileAccPropList::FileAccPropList(const FileAccPropList& orig) : PropList(orig) { //-------------------------------------------------------------------------- // Function: FileAccPropList overloaded constructor -///\brief Creates a file access property list using the id of an +///\brief Creates a file access property list using the id of an /// existing one. // Programmer: Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- @@ -70,7 +70,7 @@ void FileAccPropList::setStdio() const //-------------------------------------------------------------------------- // Function: FileAccPropList::getDriver -///\brief Return the ID of the low-level file driver. +///\brief Return the ID of the low-level file driver. ///\return A low-level driver ID which is the same ID used when the /// driver was set for the property list. The driver ID is /// only valid as long as the file driver remains registered. @@ -229,7 +229,7 @@ void FileAccPropList::getFamily(hsize_t& memb_size, FileAccPropList& memb_plist) //-------------------------------------------------------------------------- // Function: FileAccPropList::getFamily -///\brief This is an overloaded member function, provided for convenience. +///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function only in what arguments it /// accepts and its return value. ///\param memb_size - OUT: Size in bytes of each file member @@ -276,7 +276,7 @@ void FileAccPropList::setSplit( FileAccPropList& meta_plist, FileAccPropList& ra //-------------------------------------------------------------------------- // Function: FileAccPropList::setSplit -///\brief This is an overloaded member function, provided for convenience. +///\brief This is an overloaded member function, provided for convenience. /// It differs from the above function only in what arguments it /// accepts. ///\param meta_plist - IN: File access plist for the metadata file @@ -711,9 +711,9 @@ unsigned FileAccPropList::getGcReferences() const } //-------------------------------------------------------------------------- -// Function: FileAccPropList destructor +// Function: FileAccPropList destructor ///\brief Noop destructor -// Programmer Binh-Minh Ribler - 2000 +// Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- FileAccPropList::~FileAccPropList() {} diff --git a/c++/src/H5PropList.h b/c++/src/H5PropList.h index f820518..68a8d69 100644 --- a/c++/src/H5PropList.h +++ b/c++/src/H5PropList.h @@ -67,13 +67,13 @@ class H5_DLLCPP PropList : public IdComponent { // Query the value of a property in a property list. void getProperty(const char* name, void* value) const; - string getProperty(const char* name) const; void getProperty(const string& name, void* value) const; + string getProperty(const char* name) const; string getProperty(const string& name) const; // Set a property's value in a property list. - void setProperty(const char* name, void* charptr) const; - void setProperty(const char* name, const char* value) const; + void setProperty(const char* name, void* value) const; + void setProperty(const char* name, const char* charptr) const; void setProperty(const char* name, string& strg) const; void setProperty(const string& name, void* value) const; void setProperty(const string& name, string& strg) const; |