From 6b5259cc104d79b714ec93ffbb95e31b039a95b0 Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Fri, 20 Jan 2017 11:03:19 -0800
Subject: [PATCH] HDF5 detects if a name is a dataset or not without using
 exception catching

---
 lib/serialisation/Hdf5IO.h | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/lib/serialisation/Hdf5IO.h b/lib/serialisation/Hdf5IO.h
index 0fb277b0..3edb7d10 100644
--- a/lib/serialisation/Hdf5IO.h
+++ b/lib/serialisation/Hdf5IO.h
@@ -177,23 +177,18 @@ namespace Grid
     
     // read the dimensions
     H5NS::DataSpace       dataSpace;
-    H5E_auto2_t           func;
-    void *                client_data;
     std::vector<hsize_t>  hdim;
     std::vector<size_t>   dim;
     hsize_t               size = 1;
     
-    H5NS::Exception::getAutoPrint(func, &client_data);
-    try
+    if (group_.attrExists(s))
     {
-      H5NS::Exception::dontPrint();
-      dataSpace = group_.openDataSet(s).getSpace();
-    }
-    catch (H5NS::Exception &e)
-    {
-      H5NS::Exception::setAutoPrint(func, client_data);
       dataSpace = group_.openAttribute(s).getSpace();
     }
+    else
+    {
+      dataSpace = group_.openDataSet(s).getSpace();
+    }
     hdim.resize(dataSpace.getSimpleExtentNdims());
     dataSpace.getSimpleExtentDims(hdim.data());
     for (auto &d: hdim)