diff options
Diffstat (limited to 'c++')
-rw-r--r-- | c++/Makefile.in | 1 | ||||
-rw-r--r-- | c++/examples/Makefile.in | 1 | ||||
-rw-r--r-- | c++/src/H5CppDoc.h | 39 | ||||
-rw-r--r-- | c++/src/Makefile.in | 3 | ||||
-rw-r--r-- | c++/test/CMakeTests.cmake | 1 | ||||
-rw-r--r-- | c++/test/Makefile.in | 1 |
6 files changed, 23 insertions, 23 deletions
diff --git a/c++/Makefile.in b/c++/Makefile.in index c56cfc4..de87fa5 100644 --- a/c++/Makefile.in +++ b/c++/Makefile.in @@ -504,7 +504,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/c++/examples/Makefile.in b/c++/examples/Makefile.in index 273ab52..3403db4 100644 --- a/c++/examples/Makefile.in +++ b/c++/examples/Makefile.in @@ -452,7 +452,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ diff --git a/c++/src/H5CppDoc.h b/c++/src/H5CppDoc.h index f3ed040..5ba5bd4 100644 --- a/c++/src/H5CppDoc.h +++ b/c++/src/H5CppDoc.h @@ -26,28 +26,31 @@ * * \section intro_sec Introduction * - * The C++ API provides C++ wrappers for the HDF5 C library. - * It is assumed that the user has knowledge of the HDF5 file format - * and its components. If you are not familiar with HDF5 file format, - * and would like to find out more, please refer to the HDF5 documentation - * at http://www.hdfgroup.org/HDF5/doc/index.html + * The C++ API provides C++ wrappers for the HDF5 C Library. + * + * It is assumed that the user has knowledge of the + * <a href="http://www.hdfgroup.org/HDF5/doc/H5.format.html"> + * HDF5 file format</a> and its components. + * For more information on the HDF5 C Library, see the + * <a href="http://www.hdfgroup.org/HDF5/doc/index.html"> + * HDF5 Software Documentation</a> page. * - * Because the HDF5 library maps very well to + * Because the HDF5 C Library maps very well to * the object oriented design approach, classes in the C++ API can - * closely represent the interfaces of the HDF5 APIs, as followed: + * closely represent the interfaces of the C APIs as follows: * * \verbatim - HDF5 C APIs C++ Classes - ----------- ----------- - Attribute Interface (H5A) Attribute - Datasets Interface (H5D) DataSet - Error Interface (H5E) Exception - File Interface (H5F) H5File - Group Interface (H5G) Group - Identifier Interface (H5I) IdComponent - Property List Interface (H5P) PropList and subclasses - Dataspace Interface (H5S) DataSpace - Datatype Interface (H5T) DataType and subclasses + HDF5 C APIs C++ Classes + ----------- ----------- + Attribute Interface (H5A) Attribute + Datasets Interface (H5D) DataSet + Error Interface (H5E) Exception + File Interface (H5F) H5File + Group Interface (H5G) Group + Identifier Interface (H5I) IdComponent + Property List Interface (H5P) PropList and subclasses + Dataspace Interface (H5S) DataSpace + Datatype Interface (H5T) DataType and subclasses \endverbatim * \section install_sec Installation * diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index ab95efe..042e2f6 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -518,7 +518,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ @@ -682,7 +681,7 @@ CHECK_CLEANFILES = *.chkexe *.chklog *.clog # Add libtool shared library version numbers to the HDF5 library # See libtool versioning documentation online. LT_VERS_INTERFACE = 6 -LT_VERS_REVISION = 174 +LT_VERS_REVISION = 180 LT_VERS_AGE = 0 # This is our main target diff --git a/c++/test/CMakeTests.cmake b/c++/test/CMakeTests.cmake index 1048ee7..c725f69 100644 --- a/c++/test/CMakeTests.cmake +++ b/c++/test/CMakeTests.cmake @@ -60,6 +60,7 @@ if (HDF5_TEST_VFD) -P "${HDF_RESOURCES_DIR}/vfdTest.cmake" ) set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES DEPENDS CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects) + set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES TIMEOUT 30) endif (NOT HDF5_ENABLE_USING_MEMCHECKER) ENDMACRO (ADD_VFD_TEST) diff --git a/c++/test/Makefile.in b/c++/test/Makefile.in index 621618e..49c08e4 100644 --- a/c++/test/Makefile.in +++ b/c++/test/Makefile.in @@ -509,7 +509,6 @@ MAKEINFO = @MAKEINFO@ MANIFEST_TOOL = @MANIFEST_TOOL@ MKDIR_P = @MKDIR_P@ MPE = @MPE@ -MPI_GET_SIZE = @MPI_GET_SIZE@ NM = @NM@ NMEDIT = @NMEDIT@ OBJDUMP = @OBJDUMP@ |