1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68
|
Description: cope with HDF5 C++ API changes in release 1.10.1
From HDF5 upstream commits c78f1ec8829 and b1c4fd77d9c:
.
[svn-r30309] Purpose: Fix bug HDFFR-9920
Description:
Rearranged the classes to model the relationship of HDF5 objects more
accurately. The changes included:
- moved CommonFG's methods to Group
- removed CommonFG from Group's base class list
- removed CommonFG from H5File's base class list and changed
"public H5Location" to "public Group" in the base class list
- CommonFG became unused
- result of the modified partial class diagram:
.
IdComponent
|
H5Location
/
H5Object
|
/ / \
DadaType Group DataSet
|
H5File
.
[svn-r30311] Purpose: Fix bug HDFFR-9920 cont.
Description:
Continued rearranging the classes to model the relationship of HDF5
objects more accurately. The changes included:
- in the baseclass list of Attribute, changed "public IdComponent" to
"public H5Location", because location sometime can be specified with
attribute
- moved H5A wrappers in H5Location to H5Object because H5A functions
can't be called on attribute id
- removed the stubs Attribute::iterateAttrs and Attribute::renameAttr
- removed Attribute::getFileName and Attribute::flush, because
H5Location has them
- result of the modified partial class diagram, regarding Attribute
.
IdComponent
|
H5Location AbstractDs
/ \ /
H5Object Attribute
Author: Gilles Filippini <pini@debian.org>
--- a/hdf/HDFConfig.hpp
+++ b/hdf/HDFConfig.hpp
@@ -3,4 +3,9 @@
#define MAX_DIMS 10
+#ifdef HAVE_HDF5_1_10_1
+#define CommonFG Group
+#define H5Location H5Object
+#endif
+
#endif
--- a/hdf/HDFAttributable.hpp
+++ b/hdf/HDFAttributable.hpp
@@ -5,6 +5,7 @@
#include <vector>
#include <H5Cpp.h>
+#include "HDFConfig.hpp"
class HDFAttributable
{
|