From 0cec5adf06503f7b0669b35e2833803308400c8e Mon Sep 17 00:00:00 2001 From: Quincey Koziol Date: Wed, 17 Oct 2001 09:57:53 -0500 Subject: [svn-r4553] Purpose: Bug fix. Description: Fix int/unsigned problem in C++ wrapper API Platforms tested: FreeBSD 4.4 (hawkwind) --- c++/src/H5FcreatProp.cpp | 4 ++-- c++/src/H5FcreatProp.h | 4 ++-- c++/test/tfile.cpp | 9 ++++++--- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/c++/src/H5FcreatProp.cpp b/c++/src/H5FcreatProp.cpp index 3d4b21f..61abfb5 100644 --- a/c++/src/H5FcreatProp.cpp +++ b/c++/src/H5FcreatProp.cpp @@ -72,7 +72,7 @@ void FileCreatPropList::getSizes( size_t& sizeof_addr, size_t& sizeof_size ) con } } -void FileCreatPropList::setSymk( int ik, int lk ) const +void FileCreatPropList::setSymk( int ik, unsigned lk ) const { herr_t ret_value = H5Pset_sym_k( id, ik, lk ); if( ret_value < 0 ) @@ -82,7 +82,7 @@ void FileCreatPropList::setSymk( int ik, int lk ) const } } -void FileCreatPropList::getSymk( int& ik, int& lk ) const +void FileCreatPropList::getSymk( int& ik, unsigned& lk ) const { herr_t ret_value = H5Pget_sym_k( id, &ik, &lk ); if( ret_value < 0 ) diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h index 50e70b4..9dda55c 100644 --- a/c++/src/H5FcreatProp.h +++ b/c++/src/H5FcreatProp.h @@ -34,11 +34,11 @@ class FileCreatPropList : public PropList { void getSizes( size_t& sizeof_addr, size_t& sizeof_size ) const; // Sets the size of parameters used to control the symbol table nodes. - void setSymk( int int_nodes_k, int leaf_nodes_k ) const; + 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, int& leaf_nodes_k ) const; + void getSymk( int& int_nodes_k, unsigned& leaf_nodes_k ) const; // Sets the size of parameter used to control the B-trees for // indexing chunked datasets. diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp index 1ef6c19..0bb2a36 100644 --- a/c++/test/tfile.cpp +++ b/c++/test/tfile.cpp @@ -134,7 +134,8 @@ test_file_create(void) VERIFY(parm1, F1_OFFSET_SIZE, "FileCreatPropList::getSizes"); VERIFY(parm2, F1_LENGTH_SIZE, "FileCreatPropList::getSizes"); - int iparm1, iparm2; /*file-creation parameters */ + int iparm1; /*file-creation parameters */ + unsigned iparm2; /*file-creation parameters */ tmpl1.getSymk( iparm1, iparm2); VERIFY(iparm1, F1_SYM_INTERN_K, "FileCreatPropList::getSymk"); VERIFY(iparm2, F1_SYM_LEAF_K, "FileCreatPropList::getSymk"); @@ -183,7 +184,8 @@ test_file_create(void) VERIFY(parm1, F2_OFFSET_SIZE, "FileCreatPropList::getSizes"); VERIFY(parm2, F2_LENGTH_SIZE, "FileCreatPropList::getSizes"); - int iparm1, iparm2; /*file-creation parameters */ + int iparm1; /*file-creation parameters */ + unsigned iparm2; /*file-creation parameters */ tmpl1->getSymk( iparm1, iparm2); VERIFY(iparm1, F2_SYM_INTERN_K, "FileCreatPropList::getSymk"); VERIFY(iparm2, F2_SYM_LEAF_K, "FileCreatPropList::getSymk"); @@ -266,7 +268,8 @@ test_file_open(void) VERIFY(parm1, F2_OFFSET_SIZE, "FileCreatPropList::getSizes"); VERIFY(parm2, F2_LENGTH_SIZE, "FileCreatPropList::getSizes"); - int iparm1, iparm2; /*file-creation parameters */ + int iparm1; /*file-creation parameters */ + unsigned iparm2; /*file-creation parameters */ tmpl1.getSymk( iparm1, iparm2); VERIFY(iparm1, F2_SYM_INTERN_K, "FileCreatPropList::getSymk"); VERIFY(iparm2, F2_SYM_LEAF_K, "FileCreatPropList::getSymk"); -- cgit v0.12