merge and fix conflict

1 files changed, 1 insertions, 1 deletions

diff --git a/src/H5SL.c b/src/H5SL.c
index 7ca70b3..ff8edb8 100644
--- a/src/H5SL.c
+++ b/src/H5SL.c
@@ -652,7 +652,7 @@ int H5SL_term_package(void)
         /* Terminate all the factories */
         if(H5SL_fac_nused_g > 0) {
             size_t  i;
-            herr_t  H5_ATTR_SANITY_CHECK ret;
+            herr_t  H5_ATTR_NDEBUG_UNUSED ret;
 
             for(i = 0; i < H5SL_fac_nused_g; i++) {
                 ret = H5FL_fac_term(H5SL_fac_g[i]);