5 files changed, 10 insertions, 38 deletions
diff --git a/tools/h5dump/h5dump.c b/tools/h5dump/h5dump.c
index add1450..5d12db3 100644
--- a/tools/h5dump/h5dump.c
+++ b/tools/h5dump/h5dump.c
@@ -3378,13 +3378,8 @@ main(int argc, const char *argv[])
     dump_function_table = &ddl_function_table;
 
     /* Disable error reporting */
-#ifdef H5_WANT_H5_V1_6_COMPAT
-    H5Eget_auto(&func, &edata);
-    H5Eset_auto(NULL, NULL);
-#else
-    H5Eget_auto(H5E_DEFAULT, &func, &edata);
-    H5Eset_auto(H5E_DEFAULT, NULL, NULL);
-#endif /* H5_WANT_H5_V1_6_COMPAT */
+    H5Eget_auto_stack(H5E_DEFAULT, &func, &edata);
+    H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL);
 
     /* Initialize h5tools lib */
     h5tools_init();
@@ -3609,11 +3604,7 @@ done:
 
     /* To Do:  clean up XML table */
 
-#ifdef H5_WANT_H5_V1_6_COMPAT
-    H5Eset_auto(func, edata);
-#else
-    H5Eset_auto(H5E_DEFAULT, func, edata);
-#endif /* H5_WANT_H5_V1_6_COMPAT */
+    H5Eset_auto_stack(H5E_DEFAULT, func, edata);
     
     leave(d_status);
 }
diff --git a/tools/h5jam/h5jam.c b/tools/h5jam/h5jam.c
index f5cdfe0..cc64bd3 100644
--- a/tools/h5jam/h5jam.c
+++ b/tools/h5jam/h5jam.c
@@ -175,13 +175,8 @@ main (int argc, const char *argv[])
   int res;
 
   /* Disable error reporting */
-#ifdef H5_WANT_H5_V1_6_COMPAT
-  H5Eget_auto(&func, &edata);
-  H5Eset_auto(NULL, NULL);
-#else /* H5_WANT_H5_V1_6_COMPAT */
-  H5Eget_auto (H5E_DEFAULT, &func, &edata);
-  H5Eset_auto (H5E_DEFAULT, NULL, NULL);
-#endif /* H5_WANT_H5_V1_6_COMPAT */
+  H5Eget_auto_stack (H5E_DEFAULT, &func, &edata);
+  H5Eset_auto_stack (H5E_DEFAULT, NULL, NULL);
 
   parse_command_line (argc, argv);
 
diff --git a/tools/h5jam/h5unjam.c b/tools/h5jam/h5unjam.c
index 0bebda7..36a8d80 100644
--- a/tools/h5jam/h5unjam.c
+++ b/tools/h5jam/h5unjam.c
@@ -172,13 +172,8 @@ main(int argc, const char *argv[])
     struct stat sbuf;
 
     /* Disable error reporting */
-#ifdef H5_WANT_H5_V1_6_COMPAT
-    H5Eget_auto(&func, &edata);
-    H5Eset_auto(NULL, NULL);
-#else /* H5_WANT_H5_V1_6_COMPAT */
-    H5Eget_auto(H5E_DEFAULT, &func, &edata);
-    H5Eset_auto(H5E_DEFAULT, NULL, NULL);
-#endif /* H5_WANT_H5_V1_6_COMPAT */
+    H5Eget_auto_stack(H5E_DEFAULT, &func, &edata);
+    H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL);
 
     parse_command_line(argc, argv);
 
diff --git a/tools/h5jam/tellub.c b/tools/h5jam/tellub.c
index e018eda..2bb457d 100644
--- a/tools/h5jam/tellub.c
+++ b/tools/h5jam/tellub.c
@@ -135,13 +135,8 @@ main (int argc, const char *argv[])
   hid_t plist;
 
   /* Disable error reporting */
-#ifdef H5_WANT_H5_V1_6_COMPAT
-  H5Eget_auto(&func, &edata);
-  H5Eset_auto(NULL, NULL);
-#else /* H5_WANT_H5_V1_6_COMPAT */
-  H5Eget_auto (H5E_DEFAULT, &func, &edata);
-  H5Eset_auto (H5E_DEFAULT, NULL, NULL);
-#endif /* H5_WANT_H5_V1_6_COMPAT */
+  H5Eget_auto_stack(H5E_DEFAULT, &func, &edata);
+  H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL);
 
   parse_command_line (argc, argv);
 
diff --git a/tools/h5ls/h5ls.c b/tools/h5ls/h5ls.c
index 7107162..24cd953 100644
--- a/tools/h5ls/h5ls.c
+++ b/tools/h5ls/h5ls.c
@@ -2195,11 +2195,7 @@ main (int argc, const char *argv[])
     }
 
     /* Turn off HDF5's automatic error printing unless you're debugging h5ls */
-#ifdef H5_WANT_H5_V1_6_COMPAT
-    if (!show_errors_g) H5Eset_auto(NULL, NULL);
-#else
-    if (!show_errors_g) H5Eset_auto(H5E_DEFAULT, NULL, NULL);
-#endif /* H5_WANT_H5_V1_6_COMPAT */
+    if (!show_errors_g) H5Eset_auto_stack(H5E_DEFAULT, NULL, NULL);
 
 
     /* Each remaining argument is an hdf5 file followed by an optional slash