diff options
author | Vailin Choi <vchoi@hdfgroup.org> | 2014-06-23 20:24:08 (GMT) |
---|---|---|
committer | Vailin Choi <vchoi@hdfgroup.org> | 2014-06-23 20:24:08 (GMT) |
commit | 9158e8aa03227a294739aed5549ab14c1d04fb5c (patch) | |
tree | b201f1d5616b04576de70d5043d196fbe199b06d /c++ | |
parent | 67ba5eb6e8a71a110d47fd3079edcc1fe09fb95f (diff) | |
download | hdf5-9158e8aa03227a294739aed5549ab14c1d04fb5c.zip hdf5-9158e8aa03227a294739aed5549ab14c1d04fb5c.tar.gz hdf5-9158e8aa03227a294739aed5549ab14c1d04fb5c.tar.bz2 |
[svn-r25342] Bring revisions #25120 - #25266 from trunk to revise_chunks.
Tested on jam, koala, ostrich, platypus.
Diffstat (limited to 'c++')
-rw-r--r-- | c++/CMakeLists.txt | 4 | ||||
-rw-r--r-- | c++/src/CMakeLists.txt | 2 | ||||
-rw-r--r-- | c++/src/H5Exception.h | 2 | ||||
-rw-r--r-- | c++/src/Makefile.in | 2 | ||||
-rw-r--r-- | c++/src/cpp_doc_config | 4 | ||||
-rw-r--r-- | c++/test/CMakeTests.cmake | 2 |
6 files changed, 8 insertions, 8 deletions
diff --git a/c++/CMakeLists.txt b/c++/CMakeLists.txt index 89426c5..63fc083 100644 --- a/c++/CMakeLists.txt +++ b/c++/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT (HDF5_CPP) #----------------------------------------------------------------------------- # Apply Definitions to compiler in this directory and below #----------------------------------------------------------------------------- -add_definitions (${HDF5_EXTRA_C_FLAGS}) +add_definitions (${HDF_EXTRA_C_FLAGS}) #----------------------------------------------------------------------------- # Shared/Static Libs @@ -18,7 +18,7 @@ endif (BUILD_SHARED_LIBS) #----------------------------------------------------------------------------- # Generate configure file #----------------------------------------------------------------------------- -configure_file (${HDF5_RESOURCES_DIR}/H5cxx_config.h.in +configure_file (${HDF_RESOURCES_DIR}/H5cxx_config.h.in ${HDF5_BINARY_DIR}/H5cxx_pubconf.h ) diff --git a/c++/src/CMakeLists.txt b/c++/src/CMakeLists.txt index 7a48260..b07ab2b 100644 --- a/c++/src/CMakeLists.txt +++ b/c++/src/CMakeLists.txt @@ -11,7 +11,7 @@ endif (BUILD_SHARED_LIBS) #----------------------------------------------------------------------------- # Generate configure file #----------------------------------------------------------------------------- -configure_file (${HDF5_RESOURCES_DIR}/H5cxx_config.h.in +configure_file (${HDF_RESOURCES_DIR}/H5cxx_config.h.in ${HDF5_BINARY_DIR}/H5cxx_pubconf.h ) diff --git a/c++/src/H5Exception.h b/c++/src/H5Exception.h index ce35fde..639b633 100644 --- a/c++/src/H5Exception.h +++ b/c++/src/H5Exception.h @@ -74,7 +74,7 @@ class H5_DLLCPP Exception { // Prints the error stack in a default manner. static void printErrorStack(FILE* stream = stderr, hid_t err_stack = H5E_DEFAULT); // Static - void printError(FILE* stream = NULL) const; + virtual void printError(FILE* stream = NULL) const; // Default constructor Exception(); diff --git a/c++/src/Makefile.in b/c++/src/Makefile.in index 6ee76e5..ab95efe 100644 --- a/c++/src/Makefile.in +++ b/c++/src/Makefile.in @@ -682,7 +682,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 = 168 +LT_VERS_REVISION = 174 LT_VERS_AGE = 0 # This is our main target diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config index ea10b04..f2caed2 100644 --- a/c++/src/cpp_doc_config +++ b/c++/src/cpp_doc_config @@ -58,7 +58,7 @@ PROJECT_LOGO = ./header_files/hdf_logo.jpg # entered, it will be relative to the location where doxygen was started. If # left blank the current directory will be used. -OUTPUT_DIRECTORY = HTML +OUTPUT_DIRECTORY = cpplus_RM # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create 4096 sub- # directories (in 2 levels) under the output directory of each output format and @@ -1069,7 +1069,7 @@ GENERATE_HTML = YES # The default directory is: html. # This tag requires that the tag GENERATE_HTML is set to YES. -HTML_OUTPUT = HTML +HTML_OUTPUT = . # The HTML_FILE_EXTENSION tag can be used to specify the file extension for each # generated HTML page (for example: .htm, .php, .asp). diff --git a/c++/test/CMakeTests.cmake b/c++/test/CMakeTests.cmake index 147972f..1048ee7 100644 --- a/c++/test/CMakeTests.cmake +++ b/c++/test/CMakeTests.cmake @@ -57,7 +57,7 @@ if (HDF5_TEST_VFD) -D "TEST_EXPECT=${resultcode}" -D "TEST_OUTPUT=cpp_testhdf5" -D "TEST_FOLDER=${PROJECT_BINARY_DIR}" - -P "${HDF5_RESOURCES_DIR}/vfdTest.cmake" + -P "${HDF_RESOURCES_DIR}/vfdTest.cmake" ) set_tests_properties (CPP_VFD-${vfdname}-cpp_testhdf5 PROPERTIES DEPENDS CPP_VFD-${vfdname}-cpp_testhdf5-clear-objects) endif (NOT HDF5_ENABLE_USING_MEMCHECKER) |