summaryrefslogtreecommitdiffstats
path: root/src/H5Ocopy_ref.c
diff options
context:
space:
mode:
authorkmu <kmu@hdfgroup.org>2019-12-02 16:46:22 (GMT)
committerkmu <kmu@hdfgroup.org>2019-12-02 16:46:22 (GMT)
commit463199464f2b5c9f798b23ffe3f1db139b68f4d2 (patch)
tree9df3e9cafae901d462a14a6689caa93507a515e7 /src/H5Ocopy_ref.c
parentea0759d047dc6421da90375a9c27f7cde0a8e117 (diff)
parent0772b975d1d2bfa15aedeb4b6e2c2aac78c61a2f (diff)
downloadhdf5-463199464f2b5c9f798b23ffe3f1db139b68f4d2.zip
hdf5-463199464f2b5c9f798b23ffe3f1db139b68f4d2.tar.gz
hdf5-463199464f2b5c9f798b23ffe3f1db139b68f4d2.tar.bz2
Merge branch 'develop' of https://git.hdfgroup.org/scm/hdffv/hdf5 into develop
Diffstat (limited to 'src/H5Ocopy_ref.c')
-rw-r--r--src/H5Ocopy_ref.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/H5Ocopy_ref.c b/src/H5Ocopy_ref.c
index d8efeb5..20b8454 100644
--- a/src/H5Ocopy_ref.c
+++ b/src/H5Ocopy_ref.c
@@ -24,7 +24,6 @@
/****************/
#include "H5Omodule.h" /* This source code file is part of the H5O module */
-#define H5F_FRIEND /* Suppress error about including H5Fpkg */
#define H5R_FRIEND /* Suppress error about including H5Rpkg */
@@ -32,7 +31,7 @@
/* Headers */
/***********/
#include "H5private.h" /* Generic Functions */
-#include "H5Fpkg.h" /* File */
+#include "H5Fprivate.h" /* File */
#include "H5Iprivate.h" /* IDs */
#include "H5Lprivate.h" /* Links */
#include "H5MMprivate.h" /* Memory management */
@@ -359,7 +358,7 @@ H5O__copy_expand_ref_object2(H5O_loc_t *src_oloc, hid_t tid_src, H5T_t *dt_src,
HGOTO_ERROR(H5E_OHDR, H5E_CANTCONVERT, FAIL, "datatype conversion failed")
/* Retrieve loc ID */
- if((dst_loc_id = H5F__get_file_id(dst_oloc->file, FALSE)) < 0)
+ if((dst_loc_id = H5F_get_id(dst_oloc->file)) < 0)
HGOTO_ERROR(H5E_ARGS, H5E_BADTYPE, FAIL, "not a file or file object")
/* Making equivalent references in the destination file */