From ade1058e5f249531217c7f6874f3596ad85479fe Mon Sep 17 00:00:00 2001
From: Antonin Portelli <antonin.portelli@me.com>
Date: Thu, 19 Jan 2017 18:23:55 -0800
Subject: [PATCH] Hdf5Type does not need to be a pointer anymore

---
 lib/serialisation/Hdf5IO.cc  |  4 ++--
 lib/serialisation/Hdf5IO.h   | 14 +++++++-------
 lib/serialisation/Hdf5Type.h |  4 ++--
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/lib/serialisation/Hdf5IO.cc b/lib/serialisation/Hdf5IO.cc
index 4d5a2df5..c5313495 100644
--- a/lib/serialisation/Hdf5IO.cc
+++ b/lib/serialisation/Hdf5IO.cc
@@ -12,7 +12,7 @@ Hdf5Writer::Hdf5Writer(const std::string &fileName)
 {
   group_ = file_.openGroup("/");
   writeSingleAttribute(dataSetThres_, HDF5_GRID_GUARD "dataset_threshold",
-                       *Hdf5Type<unsigned int>::type());
+                       Hdf5Type<unsigned int>::type());
 }
 
 void Hdf5Writer::push(const std::string &s)
@@ -62,7 +62,7 @@ Hdf5Reader::Hdf5Reader(const std::string &fileName)
 {
   group_ = file_.openGroup("/");
   readSingleAttribute(dataSetThres_, HDF5_GRID_GUARD "dataset_threshold",
-                      *Hdf5Type<unsigned int>::type());
+                      Hdf5Type<unsigned int>::type());
 }
 
 void Hdf5Reader::push(const std::string &s)
diff --git a/lib/serialisation/Hdf5IO.h b/lib/serialisation/Hdf5IO.h
index 9281e5a0..1c73bea3 100644
--- a/lib/serialisation/Hdf5IO.h
+++ b/lib/serialisation/Hdf5IO.h
@@ -92,7 +92,7 @@ namespace Grid
   template <typename U>
   void Hdf5Writer::writeDefault(const std::string &s, const U &x)
   {
-    writeSingleAttribute(x, s, *Hdf5Type<U>::type());
+    writeSingleAttribute(x, s, Hdf5Type<U>::type());
   }
   
   template <>
@@ -122,7 +122,7 @@ namespace Grid
     {
       H5NS::DataSet dataSet;
       
-      dataSet = group_.createDataSet(s, *Hdf5Type<Element>::type(), dataSpace);
+      dataSet = group_.createDataSet(s, Hdf5Type<Element>::type(), dataSpace);
       dataSet.write(flatx.data(), *Hdf5Type<Element>::type());
     }
     else
@@ -140,7 +140,7 @@ namespace Grid
   {
     push(s);
     writeSingleAttribute(x.size(), HDF5_GRID_GUARD "vector_size",
-                         *Hdf5Type<uint64_t>::type());
+                         Hdf5Type<uint64_t>::type());
     for (hsize_t i = 0; i < x.size(); ++i)
     {
       write(s + "_" + std::to_string(i), x[i]);
@@ -162,7 +162,7 @@ namespace Grid
   template <typename U>
   void Hdf5Reader::readDefault(const std::string &s, U &output)
   {
-    readSingleAttribute(output, s, *Hdf5Type<U>::type());
+    readSingleAttribute(output, s, Hdf5Type<U>::type());
   }
   
   template <>
@@ -210,14 +210,14 @@ namespace Grid
       H5NS::DataSet dataSet;
       
       dataSet = group_.openDataSet(s);
-      dataSet.read(buf.data(), *Hdf5Type<Element>::type());
+      dataSet.read(buf.data(), Hdf5Type<Element>::type());
     }
     else
     {
       H5NS::Attribute attribute;
       
       attribute = group_.openAttribute(s);
-      attribute.read(*Hdf5Type<Element>::type(), buf.data());
+      attribute.read(Hdf5Type<Element>::type(), buf.data());
     }
     
     // reconstruct the multidimensional vector
@@ -234,7 +234,7 @@ namespace Grid
     
     push(s);
     readSingleAttribute(size, HDF5_GRID_GUARD "vector_size",
-                        *Hdf5Type<uint64_t>::type());
+                        Hdf5Type<uint64_t>::type());
     x.resize(size);
     for (hsize_t i = 0; i < x.size(); ++i)
     {
diff --git a/lib/serialisation/Hdf5Type.h b/lib/serialisation/Hdf5Type.h
index 8b56c406..75575bf9 100644
--- a/lib/serialisation/Hdf5Type.h
+++ b/lib/serialisation/Hdf5Type.h
@@ -12,9 +12,9 @@
 template <>\
 struct Hdf5Type<cType>\
 {\
-static inline const H5NS::PredType *type(void)\
+static inline const H5NS::PredType & type(void)\
 {\
-  return &H5NS::PredType::predType;\
+  return H5NS::PredType::predType;\
 }\
 static constexpr bool       isNative = true;\
 };