summaryrefslogtreecommitdiffstats
path: root/src/H5FDcore.c
diff options
context:
space:
mode:
authorScot Breitenfeld <brtnfld@hdfgroup.org>2015-06-02 14:46:51 (GMT)
committerScot Breitenfeld <brtnfld@hdfgroup.org>2015-06-02 14:46:51 (GMT)
commitf486fe1a495840b0da77a7642a7e572fac3a64b0 (patch)
treef1e361fa03bb72509736917c7f3ad71cd1f056ce /src/H5FDcore.c
parent17a9efa359e335542f84dcedf5d30c87420cbd9d (diff)
parentfc45d5fcb05fbf1b9ee05a46a25afc6fd6c40503 (diff)
downloadhdf5-f486fe1a495840b0da77a7642a7e572fac3a64b0.zip
hdf5-f486fe1a495840b0da77a7642a7e572fac3a64b0.tar.gz
hdf5-f486fe1a495840b0da77a7642a7e572fac3a64b0.tar.bz2
[svn-r27137] svn merge -r27115:27135 https://svn.hdfgroup.uiuc.edu/hdf5/trunk
Diffstat (limited to 'src/H5FDcore.c')
-rw-r--r--src/H5FDcore.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/H5FDcore.c b/src/H5FDcore.c
index f9bda00..32f23fb 100644
--- a/src/H5FDcore.c
+++ b/src/H5FDcore.c
@@ -1067,7 +1067,7 @@ H5FD_core_query(const H5FD_t * _file, unsigned long *flags /* out */)
*-------------------------------------------------------------------------
*/
static haddr_t
-H5FD_core_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
+H5FD_core_get_eoa(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
{
const H5FD_core_t *file = (const H5FD_core_t*)_file;
@@ -1092,7 +1092,7 @@ H5FD_core_get_eoa(const H5FD_t *_file, H5FD_mem_t UNUSED type)
*-------------------------------------------------------------------------
*/
static herr_t
-H5FD_core_set_eoa(H5FD_t *_file, H5FD_mem_t UNUSED type, haddr_t addr)
+H5FD_core_set_eoa(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, haddr_t addr)
{
H5FD_core_t *file = (H5FD_core_t*)_file;
herr_t ret_value = SUCCEED; /* Return value */
@@ -1126,7 +1126,7 @@ done:
*-------------------------------------------------------------------------
*/
static haddr_t
-H5FD_core_get_eof(const H5FD_t *_file, H5FD_mem_t UNUSED type)
+H5FD_core_get_eof(const H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type)
{
const H5FD_core_t *file = (const H5FD_core_t*)_file;
@@ -1214,7 +1214,7 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5FD_core_read(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, haddr_t addr,
+H5FD_core_read(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
size_t size, void *buf/*out*/)
{
H5FD_core_t *file = (H5FD_core_t*)_file;
@@ -1274,7 +1274,7 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5FD_core_write(H5FD_t *_file, H5FD_mem_t UNUSED type, hid_t UNUSED dxpl_id, haddr_t addr,
+H5FD_core_write(H5FD_t *_file, H5FD_mem_t H5_ATTR_UNUSED type, hid_t H5_ATTR_UNUSED dxpl_id, haddr_t addr,
size_t size, const void *buf)
{
H5FD_core_t *file = (H5FD_core_t*)_file;
@@ -1355,7 +1355,7 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5FD_core_flush(H5FD_t *_file, hid_t UNUSED dxpl_id, unsigned UNUSED closing)
+H5FD_core_flush(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, unsigned H5_ATTR_UNUSED closing)
{
H5FD_core_t *file = (H5FD_core_t*)_file;
herr_t ret_value = SUCCEED; /* Return value */
@@ -1453,7 +1453,7 @@ done:
*-------------------------------------------------------------------------
*/
static herr_t
-H5FD_core_truncate(H5FD_t *_file, hid_t UNUSED dxpl_id, hbool_t closing)
+H5FD_core_truncate(H5FD_t *_file, hid_t H5_ATTR_UNUSED dxpl_id, hbool_t closing)
{
H5FD_core_t *file = (H5FD_core_t*)_file;
size_t new_eof; /* New size of memory buffer */