portelli/Grid
1
0
Fork 0
mirror of https://github.com/paboyle/Grid.git synced 2025-10-31 03:54:33 +00:00
Code Releases Activity

First row might still be ragged if multi dimensional. attrExists() doesn't throw, but easier to wrap in try ... catch than to explain in comment.

Browse Source
This commit is contained in:
Michael Marshall
2021-05-22 04:34:32 +01:00
parent 244b4aa07f
commit 9b73dacf50
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Grid/serialisation/Hdf5IO.h
View File

@@ -291,8 +291,10 @@ namespace Grid
::H5::Exception::getAutoPrint(h5at, &f5at_p); ::H5::Exception::getAutoPrint(h5at, &f5at_p);
::H5::Exception::dontPrint(); ::H5::Exception::dontPrint();
try { try {
push(s); push(s); // This is what might throw
bRagged = group_.attrExists(HDF5_GRID_GUARD "vector_size"); try {
bRagged = group_.attrExists(HDF5_GRID_GUARD "vector_size");
} catch(...) {}
pop(); pop();
} catch(...) {} } catch(...) {}
::H5::Exception::setAutoPrint(h5at, f5at_p); ::H5::Exception::setAutoPrint(h5at, f5at_p);

2
Grid/serialisation/VectorUtils.h
View File

@@ -469,7 +469,7 @@ namespace Grid {
bool isFlat(const std::vector<std::vector<T>> &v) bool isFlat(const std::vector<std::vector<T>> &v)
{ {
// Make sure all of my rows are the same size // Make sure all of my rows are the same size
for (std::size_t i = 1; i < v.size(); ++i) for (std::size_t i = 0; i < v.size(); ++i)
{ {
if (v[i].size() != v[0].size() || !isFlat(v[i])) if (v[i].size() != v[0].size() || !isFlat(v[i]))
{ {