Commit bb5f16ce authored by Dave Moxey's avatar Dave Moxey
Browse files

Wrap a couple of missing HDF5 calls in H5_CALL

parent dbe272d9
...@@ -76,6 +76,7 @@ namespace H5 ...@@ -76,6 +76,7 @@ namespace H5
0); \ 0); \
} }
class Error : public std::exception class Error : public std::exception
{ {
}; };
...@@ -474,12 +475,9 @@ public: ...@@ -474,12 +475,9 @@ public:
DataTypeSharedPtr mem_t = DataTypeTraits<T>::GetType(); DataTypeSharedPtr mem_t = DataTypeTraits<T>::GetType();
DataSpaceSharedPtr memspace = DataSpace::OneD(data.size()); DataSpaceSharedPtr memspace = DataSpace::OneD(data.size());
H5Dwrite(m_Id, H5_CALL(H5Dwrite,
mem_t->GetId(), (m_Id, mem_t->GetId(), memspace->GetId(), filespace->GetId(),
memspace->GetId(), dxpl->GetId(), &data[0]) );
filespace->GetId(),
dxpl->GetId(),
&data[0]);
} }
template <class T> void Read(std::vector<T> &data) template <class T> void Read(std::vector<T> &data)
{ {
...@@ -508,12 +506,8 @@ public: ...@@ -508,12 +506,8 @@ public:
data.resize(len); data.resize(len);
DataSpaceSharedPtr memspace = DataSpace::OneD(len); DataSpaceSharedPtr memspace = DataSpace::OneD(len);
H5Dread(m_Id, H5_CALL(H5Dread, (m_Id, mem_t->GetId(), memspace->GetId(),
mem_t->GetId(), filespace->GetId(), dxpl->GetId(), &data[0]));
memspace->GetId(),
filespace->GetId(),
dxpl->GetId(),
&data[0]);
} }
private: private:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment