summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/H5Ofill.c12
-rwxr-xr-xsrc/H5SM.c2
-rw-r--r--test/tsohm.c4
3 files changed, 9 insertions, 9 deletions
diff --git a/src/H5Ofill.c b/src/H5Ofill.c
index 3ec0457..091f810 100644
--- a/src/H5Ofill.c
+++ b/src/H5Ofill.c
@@ -96,20 +96,20 @@ const H5O_msg_class_t H5O_MSG_FILL[1] = {{
H5O_FILL_ID, /*message id number */
"fill", /*message name for debugging */
sizeof(H5O_fill_t), /*native message size */
- H5O_fill_decode, /*decode message */
- H5O_fill_encode, /*encode message */
+ H5O_fill_shared_decode, /*decode message */
+ H5O_fill_shared_encode, /*encode message */
H5O_fill_new_copy, /*copy the native value */
- H5O_fill_size, /*raw message size */
+ H5O_fill_shared_size, /*raw message size */
H5O_fill_new_reset, /*free internal memory */
H5O_fill_new_free, /* free method */
- NULL, /* file delete method */
- NULL, /* link method */
+ H5O_fill_shared_delete, /* file delete method */
+ H5O_fill_shared_link, /* link method */
H5O_fill_new_get_share, /* get share method */
H5O_fill_new_set_share, /* set share method */
NULL, /*can share method */
H5O_fill_new_is_shared, /* is shared method */
NULL, /* pre copy native value to file */
- NULL, /* copy native value to file */
+ H5O_fill_shared_copy_file, /* copy native value to file */
NULL, /* post copy native value to file */
NULL, /* get creation index */
NULL, /* set creation index */
diff --git a/src/H5SM.c b/src/H5SM.c
index 05be50e..bb0d903 100755
--- a/src/H5SM.c
+++ b/src/H5SM.c
@@ -234,9 +234,7 @@ H5SM_type_to_flag(unsigned type_id, unsigned *type_flag)
case H5O_DTYPE_ID:
*type_flag = H5O_MESG_DTYPE_FLAG;
break;
-#ifdef NOT_YET
case H5O_FILL_ID:
-#endif /* NOT_YET */
case H5O_FILL_NEW_ID:
*type_flag = H5O_MESG_FILL_FLAG;
break;
diff --git a/test/tsohm.c b/test/tsohm.c
index e1a24cb..e0e4e2b 100644
--- a/test/tsohm.c
+++ b/test/tsohm.c
@@ -48,7 +48,7 @@ const unsigned test_minsizes[H5O_SHMESG_MAX_NINDEXES] = {0, 2, 40, 100, 3, 1000}
#define NAME_BUF_SIZE 512
/* How much overhead counts as "not much" when converting B-trees, etc. */
-#define OVERHEAD_ALLOWED 1.1
+#define OVERHEAD_ALLOWED 1.15
#define NUM_DATASETS 10
#define NUM_ATTRIBUTES 100
@@ -1282,6 +1282,7 @@ static void size2_verify_plist2(hid_t plist)
ret = memcmp(&fill2, &fill2_correct, DTYPE2_SIZE);
VERIFY(ret, 0, memcmp);
}
+
/*-------------------------------------------------------------------------
* Function: size2_dump_struct
@@ -1308,6 +1309,7 @@ size2_dump_struct(size2_helper_struct *sizes)
printf(" attributes: %llu \tdelta: %llu\n", sizes->attrs1, sizes->attrs1 - sizes->interleaved);
printf(" attributes 2: %llu \tdelta: %llu\n", sizes->attrs2, sizes->attrs2 - sizes->attrs1);
}
+
/*-------------------------------------------------------------------------
* Function: size2_helper