From 1c11ddec6d6d9aa39ea7d56a183e7a096bc9076f Mon Sep 17 00:00:00 2001
From: Dana Robinson <derobins@hdfgroup.org>
Date: Fri, 4 May 2018 16:43:06 -0700
Subject: Added deprecated symbol wrappers for the H5DOwrite/read_chunk
 wrappers.

---
 hl/src/H5DO.c              |  3 +++
 hl/src/H5DOpublic.h        |  8 ++++++++
 hl/test/test_h5do_compat.c | 15 ++++++++++++++-
 3 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/hl/src/H5DO.c b/hl/src/H5DO.c
index 3caa32b..057c43b 100644
--- a/hl/src/H5DO.c
+++ b/hl/src/H5DO.c
@@ -17,6 +17,7 @@
 /* public LT prototypes			*/
 #include "H5DOpublic.h"
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
 
 /*-------------------------------------------------------------------------
  * Function:    H5DOwrite_chunk
@@ -68,6 +69,8 @@ H5DOread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offset, uint32_t *fi
         return SUCCEED;
  } /* end H5DOread_chunk() */
 
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+
 
 /*-------------------------------------------------------------------------
  * Function:    H5DOappend()
diff --git a/hl/src/H5DOpublic.h b/hl/src/H5DOpublic.h
index 0271938..e09ebca 100644
--- a/hl/src/H5DOpublic.h
+++ b/hl/src/H5DOpublic.h
@@ -28,12 +28,20 @@ extern "C" {
 H5_HLDLL herr_t H5DOappend(hid_t dset_id, hid_t dxpl_id, unsigned axis,
     size_t extension, hid_t memtype, const void *buf);
 
+/* Symbols defined for compatibility with previous versions of the HDF5 API.
+ *
+ * Use of these symbols is deprecated.
+ */
+#ifndef H5_NO_DEPRECATED_SYMBOLS
+
 /* Compatibility wrappers for functionality moved to H5D */
 H5_HLDLL herr_t H5DOwrite_chunk(hid_t dset_id, hid_t dxpl_id, uint32_t filters,
     const hsize_t *offset, size_t data_size, const void *buf);
 H5_HLDLL herr_t H5DOread_chunk(hid_t dset_id, hid_t dxpl_id, const hsize_t *offset,
     uint32_t *filters /*out*/, void *buf /*out*/);
 
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/hl/test/test_h5do_compat.c b/hl/test/test_h5do_compat.c
index dc30414..4df5eef 100644
--- a/hl/test/test_h5do_compat.c
+++ b/hl/test/test_h5do_compat.c
@@ -18,6 +18,8 @@
  * work correctly.
  */
 
+#ifndef H5_NO_DEPRECATED_SYMBOLS
+
 #define FILE_NAME       "h5do_compat.h5"
 #define DATASET_NAME    "direct_chunk_io"
 
@@ -228,9 +230,11 @@ error:
     return 1;
 } /* test_direct_chunk_read() */
 
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
+
 
 /*-------------------------------------------------------------------------
- * Function:	Main function
+ * Function:	main
  *
  * Purpose:	    Test direct chunk write function H5DOwrite_chunk and
  *              chunk direct read function H5DOread_chunk
@@ -242,6 +246,14 @@ error:
  */
 int main( void )
 {
+#ifdef H5_NO_DEPRECATED_SYMBOLS
+
+    HDputs("Direct chunk read/write wrapper tests SKIPPED.");
+    HDputs("(Backward compatibility not configured)");
+    return EXIT_SUCCESS;
+
+#else
+
     hid_t   fid         = H5I_INVALID_HID;
     hid_t   did         = H5I_INVALID_HID;
     int     nerrors     = 0;
@@ -270,4 +282,5 @@ int main( void )
 error:
     HDputs("*** TESTS FAILED ***");
     return EXIT_FAILURE;
+#endif /* H5_NO_DEPRECATED_SYMBOLS */
 } /* end main() */
-- 
cgit v0.12