summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@koziol.gov>2019-04-03 22:27:10 (GMT)
committerQuincey Koziol <koziol@koziol.gov>2019-04-03 22:27:10 (GMT)
commitfc945999d00fc66f3b6251115f8bc13d4b18814c (patch)
tree1751166c747d63296baac940ccef17ee0f3d8033 /c++
parente6b8ebe95472fff931878beffe936edcacf5f122 (diff)
parent3d99a6a7937fdd67a0574b7025189ac6459a67d8 (diff)
downloadhdf5-fc945999d00fc66f3b6251115f8bc13d4b18814c.zip
hdf5-fc945999d00fc66f3b6251115f8bc13d4b18814c.tar.gz
hdf5-fc945999d00fc66f3b6251115f8bc13d4b18814c.tar.bz2
Merge remote-tracking branch 'origin/develop' into env_vol_load
Diffstat (limited to 'c++')
-rw-r--r--c++/src/cpp_doc_config2
-rw-r--r--c++/test/tobject.cpp4
2 files changed, 3 insertions, 3 deletions
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index 697fb77..c1961ec 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -38,7 +38,7 @@ PROJECT_NAME =
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = "1.11.4"
+PROJECT_NUMBER = "1.11.5"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/c++/test/tobject.cpp b/c++/test/tobject.cpp
index 537716f..23c1453 100644
--- a/c++/test/tobject.cpp
+++ b/c++/test/tobject.cpp
@@ -609,10 +609,10 @@ static void test_getobjectinfo_same_file()
catch (Exception& E)
{
cerr << " in Exception " << E.getCFuncName() << "detail: " << E.getCDetailMsg() << endl;
- issue_fail_msg("test_file_name()", __LINE__, __FILE__, E.getCDetailMsg());
+ issue_fail_msg("test_getobjectinfo_same_file()", __LINE__, __FILE__, E.getCDetailMsg());
}
-} // test_h5o_getinfo_same_file
+} // test_getobjectinfo_same_file
/*-------------------------------------------------------------------------
* Function: test_object