summaryrefslogtreecommitdiffstats
path: root/hl/src/H5IM.c
diff options
context:
space:
mode:
authorQuincey Koziol <koziol@hdfgroup.org>2014-07-30 20:55:14 (GMT)
committerQuincey Koziol <koziol@hdfgroup.org>2014-07-30 20:55:14 (GMT)
commit33ea1ada248725e4cce6316c503e5c760bcca49c (patch)
tree3fd7e951132e6aa9b7d241a418505d3ae6e33587 /hl/src/H5IM.c
parent3f701fda6528be0844afa2315c2a28357591349a (diff)
downloadhdf5-33ea1ada248725e4cce6316c503e5c760bcca49c.zip
hdf5-33ea1ada248725e4cce6316c503e5c760bcca49c.tar.gz
hdf5-33ea1ada248725e4cce6316c503e5c760bcca49c.tar.bz2
[svn-r25496] Description:
Merge 64-bit ID changes from branch to trunk. (Plus a few minor cleanups that aren't on the branch) Tested on: Mac OSX/64 10.9.4 (amazon) w/C++ & FORTRAN (h5committested on branch already for a week)
Diffstat (limited to 'hl/src/H5IM.c')
-rw-r--r--hl/src/H5IM.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/hl/src/H5IM.c b/hl/src/H5IM.c
index 9c7c7e8..9239e4e 100644
--- a/hl/src/H5IM.c
+++ b/hl/src/H5IM.c
@@ -554,7 +554,7 @@ herr_t H5IMlink_palette( hid_t loc_id,
goto out;
/* Create a reference. The reference is created on the local id. */
- if(H5Rcreate(&ref, loc_id, pal_name, H5R_OBJECT, -1) < 0)
+ if(H5Rcreate(&ref, loc_id, pal_name, H5R_OBJECT, (hid_t)-1) < 0)
goto out;
/* Write the attribute with the reference */
@@ -604,7 +604,7 @@ herr_t H5IMlink_palette( hid_t loc_id,
goto out;
/* Create a new reference for this palette. */
- if ( H5Rcreate( &ref, loc_id, pal_name, H5R_OBJECT, -1 ) < 0)
+ if ( H5Rcreate( &ref, loc_id, pal_name, H5R_OBJECT, (hid_t)-1 ) < 0)
goto out;
refbuf[n_refs] = ref;