diff options
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/src/H5DataType.cpp | 2 | ||||
| -rw-r--r-- | c++/src/H5DcreatProp.cpp | 12 | ||||
| -rw-r--r-- | c++/src/H5IdComponent.cpp | 2 | ||||
| -rw-r--r-- | c++/src/Makefile.am | 2 | ||||
| -rw-r--r-- | c++/test/Makefile.am | 6 | ||||
| -rw-r--r-- | c++/test/tattr.cpp | 2 |
6 files changed, 13 insertions, 13 deletions
diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp index af05632..609e2f9 100644 --- a/c++/src/H5DataType.cpp +++ b/c++/src/H5DataType.cpp @@ -198,7 +198,7 @@ void DataType::commit(CommonFG& loc, const H5std_string& name) const // Function: DataType::committed ///\brief Determines whether a datatype is a named type or a /// transient type. -///\return \c true if the datatype is a named type, and \c false, +///\return \c true if the datatype is a named type, and \c false, /// otherwise. ///\exception H5::DataTypeIException // Programmer Binh-Minh Ribler - 2000 diff --git a/c++/src/H5DcreatProp.cpp b/c++/src/H5DcreatProp.cpp index 5f5bceb..bc9fb03 100644 --- a/c++/src/H5DcreatProp.cpp +++ b/c++/src/H5DcreatProp.cpp @@ -262,7 +262,7 @@ H5D_fill_value_t DSetCreatPropList::isFillValueDefined() /// and the filter fails then the entire I/O operation fails. // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -void DSetCreatPropList::setFilter( H5Z_filter_t filter_id, unsigned int flags, +void DSetCreatPropList::setFilter( H5Z_filter_t filter_id, unsigned int flags, size_t cd_nelmts, const unsigned int cd_values[] ) const { herr_t ret_value = H5Pset_filter( id, filter_id, flags, cd_nelmts, cd_values ); @@ -329,8 +329,8 @@ int DSetCreatPropList::getNfilters() const ///\par Description /// Failure occurs when \a filter_number is out of range. //-------------------------------------------------------------------------- -H5Z_filter_t DSetCreatPropList::getFilter(int filter_number, - unsigned int &flags, size_t &cd_nelmts, unsigned int* cd_values, +H5Z_filter_t DSetCreatPropList::getFilter(int filter_number, + unsigned int &flags, size_t &cd_nelmts, unsigned int* cd_values, size_t namelen, char name[], unsigned int& filter_config) const { H5Z_filter_t filter_id; @@ -360,8 +360,8 @@ H5Z_filter_t DSetCreatPropList::getFilter(int filter_number, ///\exception H5::PropListIException // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -void DSetCreatPropList::getFilterById(H5Z_filter_t filter_id, - unsigned int &flags, size_t &cd_nelmts, unsigned int* cd_values, +void DSetCreatPropList::getFilterById(H5Z_filter_t filter_id, + unsigned int &flags, size_t &cd_nelmts, unsigned int* cd_values, size_t namelen, char name[], unsigned int &filter_config) const { herr_t ret_value = H5Pget_filter_by_id(id, filter_id, &flags, &cd_nelmts, @@ -394,7 +394,7 @@ void DSetCreatPropList::getFilterById(H5Z_filter_t filter_id, /// and the filter fails then the entire I/O operation fails. // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -void DSetCreatPropList::modifyFilter( H5Z_filter_t filter_id, unsigned int +void DSetCreatPropList::modifyFilter( H5Z_filter_t filter_id, unsigned int flags, size_t cd_nelmts, const unsigned int cd_values[] ) const { herr_t ret_value = H5Pmodify_filter(id, filter_id, flags, cd_nelmts, cd_values); diff --git a/c++/src/H5IdComponent.cpp b/c++/src/H5IdComponent.cpp index 86f34d1..03c7809 100644 --- a/c++/src/H5IdComponent.cpp +++ b/c++/src/H5IdComponent.cpp @@ -255,7 +255,7 @@ H5std_string IdComponent::inMemFunc(const char* func_name) const { #ifdef H5_VMS H5std_string full_name = fromClass(); - full_name.append("::"); + full_name.append("::"); full_name.append(func_name); #else H5std_string full_name = func_name; diff --git a/c++/src/Makefile.am b/c++/src/Makefile.am index 924d25c..411b4f5 100644 --- a/c++/src/Makefile.am +++ b/c++/src/Makefile.am @@ -15,7 +15,7 @@ ## Run automake to generate a Makefile.in from this file. # # HDF5-C++ Makefile(.in) -# +# include $(top_srcdir)/config/commence.am diff --git a/c++/test/Makefile.am b/c++/test/Makefile.am index 35de101..814c7eb 100644 --- a/c++/test/Makefile.am +++ b/c++/test/Makefile.am @@ -15,7 +15,7 @@ ## Run automake to generate a Makefile.in from this file. # # HDF5-C++ Makefile(.in) -# +# include $(top_srcdir)/config/commence.am @@ -42,10 +42,10 @@ testhdf5_SOURCES=testhdf5.cpp tattr.cpp tfile.cpp th5s.cpp h5cpputil.cpp # Tell conclude.am that these are C++ tests. HDF_CXX=yes -# Some C++ compilers/linkers (PGI?) create a directory named "ii_files" that +# Some C++ compilers/linkers (PGI?) create a directory named "ii_files" that # holds *.ii files, which are template entity instantiations. # This entire directory should be cleaned. -mostlyclean-local: +mostlyclean-local: @if test -d ii_files; then \ $(RM) -rf ii_files; \ fi diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp index e327493..7402e30 100644 --- a/c++/test/tattr.cpp +++ b/c++/test/tattr.cpp @@ -1012,7 +1012,7 @@ test_attr_delete(void) /**************************************************************** ** -** test_attr_dtype_shared(): Test code for using shared datatypes +** test_attr_dtype_shared(): Test code for using shared datatypes ** in attributes. ** ****************************************************************/ |