Commit fc6b18ba authored by Jan Kotanski's avatar Jan Kotanski
Browse files

bump the version and remove patches

parent 55a09cc9
......@@ -24,19 +24,19 @@ Homepage: https://github.com/ess-dmsc/h5cpp
#Vcs-Git: git://anonscm.debian.org/collab-maint/h5cpp.git
#Vcs-Browser: http://anonscm.debian.org/?p=collab-maint/h5cpp.git;a=summary
Package: libh5cpp0.0.9-dev
Package: libh5cpp0.1.0-dev
Section: libdevel
Architecture: any
Depends: libh5cpp0.0.9 (= ${binary:Version}), ${misc:Depends}
Breaks: h5cpp-dev, libh5cpp0.0.7-dev, libh5cpp0.0.8-dev
Replaces: h5cpp-dev, libh5cpp0.0.7-dev, libh5cpp0.0.8-dev
Depends: libh5cpp0.1.0 (= ${binary:Version}), ${misc:Depends}
Breaks: h5cpp-dev, libh5cpp0.0.7-dev, libh5cpp0.0.8-dev, libh5cpp0.0.9-dev
Replaces: h5cpp-dev, libh5cpp0.0.7-dev, libh5cpp0.0.8-dev, libh5cpp0.0.9-dev
Description: is a C++ wrapper for hdf5
which significantly simplifies development of HDF5 code. It provides
a high level abstraction to the HDF5 low-level types.
.
This package contains the development files.
Package: libh5cpp0.0.9
Package: libh5cpp0.1.0
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
......@@ -47,26 +47,26 @@ Description: is a C++ wrapper for hdf5
.
This package contains the runtime binaries.
Package: libh5cpp0.0.9-dbg
Package: libh5cpp0.1.0-dbg
Priority: optional
Section: debug
Architecture: any
Depends: libh5cpp0.0.9 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Breaks: h5cpp-dbg, libh5cpp0.0.7-dbg, libh5cpp0.0.8-dbg
Replaces: h5cpp-dbg, libh5cpp0.0.7-dbg, libh5cpp0.0.8-dbg
Depends: libh5cpp0.1.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
Breaks: h5cpp-dbg, libh5cpp0.0.7-dbg, libh5cpp0.0.8-dbg, libh5cpp0.0.9-dbg
Replaces: h5cpp-dbg, libh5cpp0.0.7-dbg, libh5cpp0.0.8-dbg, libh5cpp0.0.9-dbg
Description: is a C++ wrapper for hdf5
which significantly simplifies development of HDF5 code. It provides
a high level abstraction to the HDF5 low-level types.
.
This package contains the runtime binaries.
Package: libh5cpp0.0.9-doc
Package: libh5cpp0.1.0-doc
Section: doc
Priority: optional
Architecture: any
Depends: ${misc:Depends}
Breaks: h5cpp-doc, libh5cpp0.0.7-doc, libh5cpp0.0.8-doc
Replaces: h5cpp-doc, libh5cpp0.0.7-doc, libh5cpp0.0.8-doc
Breaks: h5cpp-doc, libh5cpp0.0.7-doc, libh5cpp0.0.8-doc, libh5cpp0.0.9-doc
Replaces: h5cpp-doc, libh5cpp0.0.7-doc, libh5cpp0.0.8-doc, libh5cpp0.0.9-doc
Description: is a C++ wrapper for hdf5
which significantly simplifies development of HDF5 code. It provides
a high level abstraction to the HDF5 low-level types.
......
usr/share/doc/h5cpp-*/*
From: Jan Kotanski <jankotan@gmail.com>
Date: Thu, 12 Jul 2018 07:45:24 +0200
Subject: workaround for problem with closing in STRONG mode
---
src/h5cpp/core/object_handle.cpp | 4 ++++
src/h5cpp/file/file.cpp | 25 ++++++++++++++++++++++---
2 files changed, 26 insertions(+), 3 deletions(-)
diff --git a/src/h5cpp/core/object_handle.cpp b/src/h5cpp/core/object_handle.cpp
index 7007789..abb4d9b 100644
--- a/src/h5cpp/core/object_handle.cpp
+++ b/src/h5cpp/core/object_handle.cpp
@@ -22,6 +22,7 @@
// Authors:
// Eugen Wintersberger <eugen.wintersberger@desy.de>
// Martin Shetty <martin.shetty@esss.se>
+// Jan Kotanski <jan.kotanski@desy.de>
// Created on: Aug 07, 2017
//
@@ -199,6 +200,9 @@ void ObjectHandle::close()
case ObjectHandle::Type::DATASPACE:
error_code = H5Sclose(handle_);
break;
+ case ObjectHandle::Type::GROUP:
+ error_code = H5Gclose(handle_);
+ break;
case ObjectHandle::Type::DATATYPE:
error_code = H5Tclose(handle_);
break;
diff --git a/src/h5cpp/file/file.cpp b/src/h5cpp/file/file.cpp
index f670887..eb6f234 100644
--- a/src/h5cpp/file/file.cpp
+++ b/src/h5cpp/file/file.cpp
@@ -19,8 +19,10 @@
// Boston, MA 02110-1301 USA
// ===========================================================================
//
-// Authors: Eugen Wintersberger <eugen.wintersberger@desy.de>
-// Author: Martin Shetty <martin.shetty@esss.se>
+// Authors:
+// Eugen Wintersberger <eugen.wintersberger@desy.de>
+// Martin Shetty <martin.shetty@esss.se>
+// Jan Kotanski <jan.kotanski@desy.de>
// Created on: Sep 8, 2017
//
@@ -28,6 +30,7 @@
#include <h5cpp/node/node.hpp>
#include <h5cpp/node/group.hpp>
#include <h5cpp/error/error.hpp>
+#include <h5cpp/property/file_access.hpp>
namespace hdf5 {
namespace file {
@@ -67,9 +70,25 @@ void File::flush(Scope scope) const
}
}
+
void File::close()
{
- handle_.close();
+ property::FileAccessList fapl = property::FileAccessList(ObjectHandle(H5Fget_access_plist(static_cast<hid_t>(*this))));
+
+ if(fapl.close_degree() == property::CloseDegree::STRONG)
+ {
+ hid_t mid= static_cast<hid_t>(*this);
+ handle_.close();
+ // closes all copies of file hid_t's created with Node::link_.parent_file_
+ while(H5Iget_type(mid) > 0)
+ {
+ H5Fclose(mid);
+ }
+ }
+ else
+ {
+ handle_.close();
+ }
}
boost::filesystem::path File::path() const
0001-workaround-for-problem-with-closing-in-STRONG-mode.patch
......@@ -32,7 +32,7 @@ override_dh_auto_test:
cd $(BUILDDIR) && make run_tests
override_dh_strip:
dh_strip --dbg-package=libh5cpp0.0.9-dbg
dh_strip --dbg-package=libh5cpp0.1.0-dbg
override_dh_auto_configure:
dh_auto_configure -- -DCONAN=DISABLE
......
Supports Markdown
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