summaryrefslogtreecommitdiffstats
path: root/c++/src
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2001-12-05 16:42:40 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2001-12-05 16:42:40 (GMT)
commit4886a6c447dc445ed34d8c6ea162b57cbbcec72b (patch)
treedf5e3f11b8af2766dcd07418331747c085245afb /c++/src
parenta9c747deba6e588b2ec5bc624a53c976a9faa3bc (diff)
downloadhdf5-4886a6c447dc445ed34d8c6ea162b57cbbcec72b.zip
hdf5-4886a6c447dc445ed34d8c6ea162b57cbbcec72b.tar.gz
hdf5-4886a6c447dc445ed34d8c6ea162b57cbbcec72b.tar.bz2
[svn-r4670] Purpose:
Backward Compatibility Fix Description: One of H5P[gs]et_sym_k's parameters changed between v1.4 and the development branch. Solution: Added v1.4 compat stuff around H5P[gs]et_sym_k implementation and testing to allow v1.4.x users to continue to use their source code without modification. These changes are for everything except the FORTRAN wrappers - I spoke with Elena and she will make the FORTRAN wrapper changes. Platforms tested: FreeBSD 4.4 (hawkwind)
Diffstat (limited to 'c++/src')
-rw-r--r--c++/src/H5FcreatProp.cpp22
-rw-r--r--c++/src/H5FcreatProp.h9
2 files changed, 31 insertions, 0 deletions
diff --git a/c++/src/H5FcreatProp.cpp b/c++/src/H5FcreatProp.cpp
index 7d6fc62..0e98cfd 100644
--- a/c++/src/H5FcreatProp.cpp
+++ b/c++/src/H5FcreatProp.cpp
@@ -72,6 +72,27 @@ void FileCreatPropList::getSizes( size_t& sizeof_addr, size_t& sizeof_size ) con
}
}
+#ifdef H5_WANT_H5_V1_4_COMPAT
+void FileCreatPropList::setSymk( int ik, int lk ) const
+{
+ herr_t ret_value = H5Pset_sym_k( id, ik, lk );
+ if( ret_value < 0 )
+ {
+ throw PropListIException("FileCreatPropList::setSymk",
+ "H5Pset_sym_k failed");
+ }
+}
+
+void FileCreatPropList::getSymk( int& ik, int& lk ) const
+{
+ herr_t ret_value = H5Pget_sym_k( id, &ik, &lk );
+ if( ret_value < 0 )
+ {
+ throw PropListIException("FileCreatPropList::getSymk",
+ "H5Pget_sym_k failed");
+ }
+}
+#else /* H5_WANT_H5_V1_4_COMPAT */
void FileCreatPropList::setSymk( int ik, unsigned lk ) const
{
herr_t ret_value = H5Pset_sym_k( id, ik, lk );
@@ -91,6 +112,7 @@ void FileCreatPropList::getSymk( int& ik, unsigned& lk ) const
"H5Pget_sym_k failed");
}
}
+#endif /* H5_WANT_H5_V1_4_COMPAT */
void FileCreatPropList::setIstorek( int ik ) const
{
diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h
index 9dda55c..54b615b 100644
--- a/c++/src/H5FcreatProp.h
+++ b/c++/src/H5FcreatProp.h
@@ -33,12 +33,21 @@ class FileCreatPropList : public PropList {
// file according to this file creation property list.
void getSizes( size_t& sizeof_addr, size_t& sizeof_size ) const;
+#ifdef H5_WANT_H5_V1_4_COMPAT
+ // Sets the size of parameters used to control the symbol table nodes.
+ void setSymk( int int_nodes_k, int leaf_nodes_k ) const;
+
+ // Retrieves the size of the symbol table B-tree 1/2 rank and the
+ // symbol table leaf node 1/2 size.
+ void getSymk( int& int_nodes_k, int& leaf_nodes_k ) const;
+#else /* H5_WANT_H5_V1_4_COMPAT */
// Sets the size of parameters used to control the symbol table nodes.
void setSymk( int int_nodes_k, unsigned leaf_nodes_k ) const;
// Retrieves the size of the symbol table B-tree 1/2 rank and the
// symbol table leaf node 1/2 size.
void getSymk( int& int_nodes_k, unsigned& leaf_nodes_k ) const;
+#endif /* H5_WANT_H5_V1_4_COMPAT */
// Sets the size of parameter used to control the B-trees for
// indexing chunked datasets.