mirror/hdf5
2
0
Fork 0
mirror of https://github.com/HDFGroup/hdf5.git synced 2024-11-27 02:10:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

[svn-r15660] Purpose: Fix minor Windows issues in new H5EA interface.

Browse Source 
Description:
We've run into a few Windows-specific problems with the new H5EA interface.  In particular, this checkin makes the following changes:
-- Change shutdown defined in earray.c to shutdown_ea, to avoid conflicting with another Windows-specific system call.
-- Prefix H5EA_get in H5EAprivate.h with H5_DLL, so the function is properly exported in Windows DLL version.

These changes shouldn't break any other platforms.

Tested:
VS2005 on WinXP
h5committest (linew kagiso smirom)
This commit is contained in:
Scott Wegner 2008-09-19 12:13:10 -05:00
parent 82f30910c2
commit ed54f5ab7e
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/H5EAprivate.h
View File

@ -104,7 +104,7 @@ H5_DLL H5EA_t *H5EA_open(H5F_t *f, hid_t dxpl_id, haddr_t ea_addr,
H5_DLL herr_t H5EA_get_nelmts(const H5EA_t *ea, hsize_t *nelmts); H5_DLL herr_t H5EA_get_nelmts(const H5EA_t *ea, hsize_t *nelmts);
H5_DLL herr_t H5EA_get_addr(const H5EA_t *ea, haddr_t *addr); H5_DLL herr_t H5EA_get_addr(const H5EA_t *ea, haddr_t *addr);
H5_DLL herr_t H5EA_set(const H5EA_t *ea, hid_t dxpl_id, hsize_t idx, const void *elmt); H5_DLL herr_t H5EA_set(const H5EA_t *ea, hid_t dxpl_id, hsize_t idx, const void *elmt);
herr_t H5EA_get(const H5EA_t *ea, hid_t dxpl_id, hsize_t idx, void *elmt); H5_DLL herr_t H5EA_get(const H5EA_t *ea, hid_t dxpl_id, hsize_t idx, void *elmt);
H5_DLL herr_t H5EA_close(H5EA_t *ea, hid_t dxpl_id); H5_DLL herr_t H5EA_close(H5EA_t *ea, hid_t dxpl_id);
H5_DLL herr_t H5EA_delete(H5F_t *f, hid_t dxpl_id, haddr_t ea_addr); H5_DLL herr_t H5EA_delete(H5F_t *f, hid_t dxpl_id, haddr_t ea_addr);

16
test/earray.c
View File

@ -339,7 +339,7 @@ error:
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
* Function: shutdown * Function: shutdown_ea
* *
* Purpose: Close array, delete array, close file and verify that file * Purpose: Close array, delete array, close file and verify that file
* is empty size * is empty size
@ -353,7 +353,7 @@ error:
*------------------------------------------------------------------------- *-------------------------------------------------------------------------
*/ */
static int static int
shutdown(hid_t file, H5F_t *f, H5EA_t *ea, haddr_t ea_addr) shutdown_ea(hid_t file, H5F_t *f, H5EA_t *ea, haddr_t ea_addr)
{ {
h5_stat_size_t file_size; /* File size, after deleting array */ h5_stat_size_t file_size; /* File size, after deleting array */
@ -389,7 +389,7 @@ HDsystem("cp earray.h5 earray.h5.save");
error: error:
return(-1); return(-1);
} /* shutdown() */ } /* shutdown_ea() */
/*------------------------------------------------------------------------- /*-------------------------------------------------------------------------
@ -521,7 +521,7 @@ test_create(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t UNUSED *tpara
TEST_ERROR TEST_ERROR
/* Close array, delete array, close file & verify file is empty */ /* Close array, delete array, close file & verify file is empty */
if(shutdown(file, f, ea, ea_addr) < 0) if(shutdown_ea(file, f, ea, ea_addr) < 0)
TEST_ERROR TEST_ERROR
/* All tests passed */ /* All tests passed */
@ -591,7 +591,7 @@ test_reopen(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
TEST_ERROR TEST_ERROR
/* Close array, delete array, close file & verify file is empty */ /* Close array, delete array, close file & verify file is empty */
if(shutdown(file, f, ea, ea_addr) < 0) if(shutdown_ea(file, f, ea, ea_addr) < 0)
TEST_ERROR TEST_ERROR
/* All tests passed */ /* All tests passed */
@ -695,7 +695,7 @@ test_open_twice(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
FAIL_STACK_ERROR FAIL_STACK_ERROR
/* Close array, delete array, close file & verify file is empty */ /* Close array, delete array, close file & verify file is empty */
if(shutdown(file2, f2, ea2, ea_addr) < 0) if(shutdown_ea(file2, f2, ea2, ea_addr) < 0)
TEST_ERROR TEST_ERROR
/* All tests passed */ /* All tests passed */
@ -931,7 +931,7 @@ test_set_first(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
TEST_ERROR TEST_ERROR
/* Close array, delete array, close file & verify file is empty */ /* Close array, delete array, close file & verify file is empty */
if(shutdown(file, f, ea, ea_addr) < 0) if(shutdown_ea(file, f, ea, ea_addr) < 0)
TEST_ERROR TEST_ERROR
/* All tests passed */ /* All tests passed */
@ -1057,7 +1057,7 @@ test_set_iblock(hid_t fapl, H5EA_create_t *cparam, earray_test_param_t *tparam)
} /* end for */ } /* end for */
/* Close array, delete array, close file & verify file is empty */ /* Close array, delete array, close file & verify file is empty */
if(shutdown(file, f, ea, ea_addr) < 0) if(shutdown_ea(file, f, ea, ea_addr) < 0)
TEST_ERROR TEST_ERROR
/* All tests passed */ /* All tests passed */