summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDana Robinson <derobins@hdfgroup.org>2017-04-26 12:01:29 (GMT)
committerDana Robinson <derobins@hdfgroup.org>2017-04-26 12:01:29 (GMT)
commitdff30ae9c7e71d3e6675222e2fffd7202871390d (patch)
tree2b3bae5afe80551b0d5429e057e749c45cf764da
parent43b3bbd0544def4467204c0e4b6f3ae4f44d5506 (diff)
downloadhdf5-dff30ae9c7e71d3e6675222e2fffd7202871390d.zip
hdf5-dff30ae9c7e71d3e6675222e2fffd7202871390d.tar.gz
hdf5-dff30ae9c7e71d3e6675222e2fffd7202871390d.tar.bz2
Added missing #ifdef __cplusplus macros to H5Epubgen.h.
Fixes HDFFV-9638.
-rwxr-xr-xbin/make_err12
-rw-r--r--release_docs/RELEASE.txt6
2 files changed, 16 insertions, 2 deletions
diff --git a/bin/make_err b/bin/make_err
index 4b1f474..1b39d53fb 100755
--- a/bin/make_err
+++ b/bin/make_err
@@ -175,6 +175,12 @@ sub create_public ($) {
print_warning(*HEADER);
print_startprotect(*HEADER, $file);
+ # Begin extern C block
+ print HEADER "\n";
+ print HEADER "#ifdef __cplusplus\n";
+ print HEADER "extern \"C\" {\n";
+ print HEADER "#endif\n";
+
# Iterate over all the major errors
print HEADER "\n/*********************/\n";
print HEADER "/* Major error codes */\n";
@@ -202,6 +208,12 @@ sub create_public ($) {
}
}
+ # End extern C block
+ print HEADER "\n";
+ print HEADER "#ifdef __cplusplus\n";
+ print HEADER "}\n";
+ print HEADER "#endif\n";
+
print_endprotect(*HEADER, $file);
# Close header file
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 40c9644..afab87c 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -99,7 +99,7 @@ Support for New Platforms, Languages, and Compilers
-Bug Fixes since HDF5-1.8.17
+Bug Fixes since HDF5-1.8.18
===========================
Configuration
@@ -109,7 +109,9 @@ Bug Fixes since HDF5-1.8.17
Library
-------
- - None
+ - Missing #ifdef __cplusplus macros were added to the generated H5Epubgen.h file.
+
+ (HDFFV-9638, DER, 4/25/2017)
Parallel Library