summaryrefslogtreecommitdiffstats
path: root/c++
diff options
context:
space:
mode:
Diffstat (limited to 'c++')
-rw-r--r--c++/test/dsets.cpp8
-rw-r--r--c++/test/tarray.cpp2
-rw-r--r--c++/test/tattr.cpp14
-rw-r--r--c++/test/tcompound.cpp2
-rw-r--r--c++/test/tdspl.cpp6
-rw-r--r--c++/test/tfile.cpp6
-rw-r--r--c++/test/th5s.cpp12
-rw-r--r--c++/test/tobject.cpp12
-rw-r--r--c++/test/trefer.cpp4
-rw-r--r--c++/test/tvlstr.cpp6
10 files changed, 36 insertions, 36 deletions
diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp
index 301272b..e1cee97 100644
--- a/c++/test/dsets.cpp
+++ b/c++/test/dsets.cpp
@@ -726,8 +726,8 @@ test_nbit_compression(H5File &file)
SUBTEST("N-bit compression (setup)");
- HDmemset(orig_data, 0, DIM1 * DIM2 * sizeof(s1_t));
- HDmemset(new_data, 0, DIM1 * DIM2 * sizeof(s1_t));
+ memset(orig_data, 0, DIM1 * DIM2 * sizeof(s1_t));
+ memset(new_data, 0, DIM1 * DIM2 * sizeof(s1_t));
try {
// Define datatypes of members of compound datatype
@@ -1093,7 +1093,7 @@ test_getnativeinfo(H5File &file)
// Get dataset header info
H5O_native_info_t ninfo;
- HDmemset(&ninfo, 0, sizeof(ninfo));
+ memset(&ninfo, 0, sizeof(ninfo));
dataset.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_HDR);
verify_val(static_cast<long>(ninfo.hdr.nchunks), 1, "DataSet::getNativeObjinfo", __LINE__, __FILE__);
dataset.close();
@@ -1101,7 +1101,7 @@ test_getnativeinfo(H5File &file)
// Open the dataset we created above and then close it. This is one
// way to open an existing dataset for accessing.
dataset = file.openDataSet(DSET_DEFAULT_NAME);
- HDmemset(&ninfo, 0, sizeof(ninfo));
+ memset(&ninfo, 0, sizeof(ninfo));
dataset.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_ALL);
verify_val(static_cast<long>(ninfo.hdr.nchunks), 1, "DataSet::getNativeObjinfo", __LINE__, __FILE__);
dataset.close();
diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp
index e207592..f616dcd 100644
--- a/c++/test/tarray.cpp
+++ b/c++/test/tarray.cpp
@@ -239,7 +239,7 @@ test_array_compound_array()
verify_val(ndims, ARRAY1_RANK, "f2_atype_check.getArrayNDims", __LINE__, __FILE__);
// Get the array dimensions
- HDmemset(rdims1, 0, sizeof(rdims1));
+ memset(rdims1, 0, sizeof(rdims1));
f2_atype_check.getArrayDims(rdims1);
// Check the array dimensions
diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp
index fe27cb5..e018ab1 100644
--- a/c++/test/tattr.cpp
+++ b/c++/test/tattr.cpp
@@ -297,7 +297,7 @@ test_attr_getname(FileAccPropList &fapl)
// 1. With arbitrary buf_size that is larger than the name size
size_t buf_size = FATTR1_NAME.length() + 10;
char *fattr1_name = new char[buf_size + 1];
- HDmemset(fattr1_name, 0, buf_size + 1);
+ memset(fattr1_name, 0, buf_size + 1);
ssize_t name_size = 0; // actual length of attribute name
name_size = fattr1.getName(fattr1_name, buf_size + 1);
CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__);
@@ -312,7 +312,7 @@ test_attr_getname(FileAccPropList &fapl)
buf_size = 4;
char short_name[5] = "File"; // to verify the read name
fattr1_name = new char[buf_size + 1];
- HDmemset(fattr1_name, 0, buf_size + 1);
+ memset(fattr1_name, 0, buf_size + 1);
name_size = fattr1.getName(fattr1_name, buf_size + 1);
CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__);
verify_val(static_cast<size_t>(name_size), FATTR1_NAME.size(), "Attribute::getName", __LINE__,
@@ -324,7 +324,7 @@ test_attr_getname(FileAccPropList &fapl)
// 3. With a buf_size that equals the name's length.
buf_size = FATTR1_NAME.length();
fattr1_name = new char[buf_size + 1];
- HDmemset(fattr1_name, 0, buf_size + 1);
+ memset(fattr1_name, 0, buf_size + 1);
name_size = fattr1.getName(fattr1_name, buf_size + 1);
CHECK(name_size, FAIL, "Attribute::getName", __LINE__, __FILE__);
verify_val(fattr1_name, FATTR1_NAME, "Attribute::getName", __LINE__, __FILE__);
@@ -531,7 +531,7 @@ test_attr_basic_read(FileAccPropList &fapl)
// Verify the correct number of attributes another way
H5O_info2_t oinfo;
- HDmemset(&oinfo, 0, sizeof(oinfo));
+ memset(&oinfo, 0, sizeof(oinfo));
dataset.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS);
verify_val(static_cast<long>(oinfo.num_attrs), 3, "DataSet::getObjinfo", __LINE__, __FILE__);
@@ -560,7 +560,7 @@ test_attr_basic_read(FileAccPropList &fapl)
verify_val(num_attrs, 1, "Group::getNumAttrs", __LINE__, __FILE__);
// Verify the correct number of attributes another way
- HDmemset(&oinfo, 0, sizeof(oinfo));
+ memset(&oinfo, 0, sizeof(oinfo));
group.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS);
verify_val(static_cast<long>(oinfo.num_attrs), 1, "Group::getObjinfo", __LINE__, __FILE__);
@@ -686,7 +686,7 @@ test_attr_compound_read(FileAccPropList &fapl)
// Verify the correct number of attributes another way
H5O_info2_t oinfo;
- HDmemset(&oinfo, 0, sizeof(oinfo));
+ memset(&oinfo, 0, sizeof(oinfo));
dataset.getObjinfo(oinfo, H5O_INFO_NUM_ATTRS);
verify_val(static_cast<long>(oinfo.num_attrs), 1, "DataSet::getObjinfo", __LINE__, __FILE__);
@@ -789,7 +789,7 @@ test_attr_compound_read(FileAccPropList &fapl)
hsize_t ii, jj;
for (ii = 0; ii < ATTR4_DIM1; ii++)
for (jj = 0; jj < ATTR4_DIM2; jj++)
- if (HDmemcmp(&attr_data4[ii][jj], &read_data4[ii][jj], sizeof(struct attr4_struct)) != 0) {
+ if (memcmp(&attr_data4[ii][jj], &read_data4[ii][jj], sizeof(struct attr4_struct)) != 0) {
TestErrPrintf("%d:attribute data different: attr_data4[%" PRIuHSIZE "][%" PRIuHSIZE
"].i=%d, "
"read_data4[%" PRIuHSIZE "][%" PRIuHSIZE "].i=%d\n",
diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp
index 2ec9e25..53939dd 100644
--- a/c++/test/tcompound.cpp
+++ b/c++/test/tcompound.cpp
@@ -108,7 +108,7 @@ test_compound_2()
s_ptr->d = i * 8 + 6;
s_ptr->e = i * 8 + 7;
}
- HDmemcpy(buf, orig, nelmts * sizeof(src_typ_t));
+ memcpy(buf, orig, nelmts * sizeof(src_typ_t));
// Build hdf5 datatypes
array_dt = new ArrayType(PredType::NATIVE_INT, 1, &four);
diff --git a/c++/test/tdspl.cpp b/c++/test/tdspl.cpp
index e076c5a..bccc41a 100644
--- a/c++/test/tdspl.cpp
+++ b/c++/test/tdspl.cpp
@@ -61,7 +61,7 @@ test_transfplist()
// for it, then read and verify the expression from the copied plist
size_t tran_len = static_cast<size_t>(dxpl_c_to_f_copy.getDataTransform(NULL));
char *c_to_f_read = static_cast<char *>(malloc(tran_len + 1));
- HDmemset(c_to_f_read, 0, tran_len + 1);
+ memset(c_to_f_read, 0, tran_len + 1);
dxpl_c_to_f_copy.getDataTransform(c_to_f_read, tran_len + 1);
verify_val(const_cast<const char *>(c_to_f_read), const_cast<const char *>(c_to_f),
"DSetMemXferPropList::getDataTransform", __LINE__, __FILE__);
@@ -76,7 +76,7 @@ test_transfplist()
// ssize_t getDataTransform(char* exp, const size_t buf_size [default=0])
tran_len = static_cast<size_t>(dxpl_c_to_f.getDataTransform(NULL));
c_to_f_read = static_cast<char *>(malloc(tran_len + 1));
- HDmemset(c_to_f_read, 0, tran_len + 1);
+ memset(c_to_f_read, 0, tran_len + 1);
dxpl_c_to_f.getDataTransform(c_to_f_read, tran_len + 1);
verify_val(const_cast<const char *>(c_to_f_read), const_cast<const char *>(c_to_f),
"DSetMemXferPropList::getDataTransform", __LINE__, __FILE__);
@@ -92,7 +92,7 @@ test_transfplist()
// ssize_t getDataTransform(char* exp, const size_t buf_size)
tran_len = static_cast<size_t>(dxpl_utrans_inv.getDataTransform(NULL, 0));
char *utrans_inv_read = static_cast<char *>(malloc(tran_len + 1));
- HDmemset(utrans_inv_read, 0, tran_len + 1);
+ memset(utrans_inv_read, 0, tran_len + 1);
dxpl_utrans_inv.getDataTransform(utrans_inv_read, tran_len + 1);
verify_val(const_cast<const char *>(utrans_inv_read), const_cast<const char *>(utrans_inv),
"DSetMemXferPropList::getDataTransform", __LINE__, __FILE__);
diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
index 97b3a36..212a241 100644
--- a/c++/test/tfile.cpp
+++ b/c++/test/tfile.cpp
@@ -626,7 +626,7 @@ test_file_attribute()
verify_val(n_attrs, 1, "DataSet::getNumAttrs()", __LINE__, __FILE__);
// Read back attribute's data
- HDmemset(rdata, 0, sizeof(rdata));
+ memset(rdata, 0, sizeof(rdata));
dattr.read(PredType::NATIVE_INT, rdata);
/* Check results */
for (i = 0; i < ATTR1_DIM1; i++) {
@@ -682,7 +682,7 @@ test_libver_bounds_real(H5F_libver_t libver_create, unsigned oh_vers_create, H5F
// Verify object header version another way
H5O_native_info_t ninfo;
- HDmemset(&ninfo, 0, sizeof(ninfo));
+ memset(&ninfo, 0, sizeof(ninfo));
file.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_HDR);
verify_val(ninfo.hdr.version, oh_vers_create, "H5File::getNativeObjinfo", __LINE__, __FILE__);
@@ -709,7 +709,7 @@ test_libver_bounds_real(H5F_libver_t libver_create, unsigned oh_vers_create, H5F
verify_val(obj_version, oh_vers_mod, "Group::objVersion", __LINE__, __FILE__);
// Verify object header version another way
- HDmemset(&ninfo, 0, sizeof(ninfo));
+ memset(&ninfo, 0, sizeof(ninfo));
group.getNativeObjinfo(ninfo, H5O_NATIVE_INFO_HDR);
verify_val(ninfo.hdr.version, oh_vers_mod, "Group::getNativeObjinfo", __LINE__, __FILE__);
diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp
index e0a12b4..04bc3c0 100644
--- a/c++/test/th5s.cpp
+++ b/c++/test/th5s.cpp
@@ -116,8 +116,8 @@ test_h5s_basic()
hsize_t tdims[4]; // Dimension array to test with
ndims = sid1.getSimpleExtentDims(tdims);
verify_val(ndims, SPACE1_RANK, "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
- verify_val(HDmemcmp(tdims, dims1, SPACE1_RANK * sizeof(unsigned)), 0,
- "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
+ verify_val(memcmp(tdims, dims1, SPACE1_RANK * sizeof(unsigned)), 0, "DataSpace::getSimpleExtentDims",
+ __LINE__, __FILE__);
// Create simple dataspace sid2
hsize_t max2[] = {SPACE2_MAX1, SPACE2_MAX2, SPACE2_MAX3, SPACE2_MAX4};
@@ -135,9 +135,9 @@ test_h5s_basic()
// Retrieves dimension size and max size of dataspace sid2 and
// verify them
ndims = sid2.getSimpleExtentDims(tdims, tmax);
- verify_val(HDmemcmp(tdims, dims2, SPACE2_RANK * sizeof(unsigned)), 0,
- "DataSpace::getSimpleExtentDims", __LINE__, __FILE__);
- verify_val(HDmemcmp(tmax, max2, SPACE2_RANK * sizeof(unsigned)), 0, "DataSpace::getSimpleExtentDims",
+ verify_val(memcmp(tdims, dims2, SPACE2_RANK * sizeof(unsigned)), 0, "DataSpace::getSimpleExtentDims",
+ __LINE__, __FILE__);
+ verify_val(memcmp(tmax, max2, SPACE2_RANK * sizeof(unsigned)), 0, "DataSpace::getSimpleExtentDims",
__LINE__, __FILE__);
// Check to be sure we can't create a simple data space that has too
@@ -444,7 +444,7 @@ test_h5s_compound_scalar_read()
dataset.read(&rdata, type);
// Verify read data
- if (HDmemcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) {
+ if (memcmp(&space4_data, &rdata, sizeof(struct space4_struct)) != 0) {
cerr << "scalar data different: space4_data.c1=" << space4_data.c1
<< ", read_data4.c1=" << rdata.c1 << endl;
cerr << "scalar data different: space4_data.u=" << space4_data.u << ", read_data4.u=" << rdata.u
diff --git a/c++/test/tobject.cpp b/c++/test/tobject.cpp
index dc67ea2..741c628 100644
--- a/c++/test/tobject.cpp
+++ b/c++/test/tobject.cpp
@@ -536,8 +536,8 @@ test_getobjectinfo_same_file()
Group grp2(file1.createGroup(GROUP2NAME));
// Reset object info
- HDmemset(&oinfo1, 0, sizeof(oinfo1));
- HDmemset(&oinfo2, 0, sizeof(oinfo2));
+ memset(&oinfo1, 0, sizeof(oinfo1));
+ memset(&oinfo2, 0, sizeof(oinfo2));
// Query the info of two groups and verify that they have the same
// file number
@@ -559,8 +559,8 @@ test_getobjectinfo_same_file()
grp2 = file2.openGroup(GROUP2NAME);
// Reset object info
- HDmemset(&oinfo1, 0, sizeof(oinfo1));
- HDmemset(&oinfo2, 0, sizeof(oinfo2));
+ memset(&oinfo1, 0, sizeof(oinfo1));
+ memset(&oinfo2, 0, sizeof(oinfo2));
// Query the info of two groups and verify that they have the same
// file number
@@ -569,8 +569,8 @@ test_getobjectinfo_same_file()
verify_val(oinfo1.fileno, oinfo2.fileno, "file number from getObjinfo", __LINE__, __FILE__);
// Reset object info
- HDmemset(&oinfo1, 0, sizeof(oinfo1));
- HDmemset(&oinfo2, 0, sizeof(oinfo2));
+ memset(&oinfo1, 0, sizeof(oinfo1));
+ memset(&oinfo2, 0, sizeof(oinfo2));
file1.getObjinfo(GROUP1NAME, oinfo1);
file1.getObjinfo(GROUP2NAME, oinfo2);
diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp
index f207eb7..31c5022 100644
--- a/c++/test/trefer.cpp
+++ b/c++/test/trefer.cpp
@@ -488,14 +488,14 @@ test_reference_group()
// Check object type using Group::getObjinfo()
H5O_info2_t oinfo;
- HDmemset(&oinfo, 0, sizeof(oinfo));
+ memset(&oinfo, 0, sizeof(oinfo));
group.getObjinfo(".", H5_INDEX_NAME, H5_ITER_INC, 0, oinfo);
verify_val(static_cast<long>(oinfo.type), static_cast<long>(H5O_TYPE_DATASET), "Group::getObjinfo",
__LINE__, __FILE__);
// Check for out of bound query by index
try {
- HDmemset(&oinfo, 0, sizeof(oinfo));
+ memset(&oinfo, 0, sizeof(oinfo));
group.getObjinfo(".", H5_INDEX_NAME, H5_ITER_INC, 9, oinfo);
// Should FAIL but didn't, so throw an invalid action exception
diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp
index a9178af..748333f 100644
--- a/c++/test/tvlstr.cpp
+++ b/c++/test/tvlstr.cpp
@@ -179,7 +179,7 @@ test_vlstring_dataset()
dset1 = root.createDataSet("test_scalar_small", vlst, ds_space);
dynstring_ds_write = static_cast<char *>(calloc(2, sizeof(char)));
- HDmemset(dynstring_ds_write, 'A', 1);
+ memset(dynstring_ds_write, 'A', 1);
// Write data to the dataset, then read it back.
dset1.write(&dynstring_ds_write, vlst);
@@ -277,7 +277,7 @@ test_vlstring_array_dataset()
// Create and write another dataset.
DataSet dataset2(file1->createDataSet("Dataset2", vlst, scalar_space));
char *wdata2 = static_cast<char *>(calloc(65534, sizeof(char)));
- HDmemset(wdata2, 'A', 65533);
+ memset(wdata2, 'A', 65533);
dataset2.write(&wdata2, vlst);
char *rdata2;
@@ -654,7 +654,7 @@ test_vlstring_attribute()
gr_attr = root.createAttribute("test_scalar_large", vlst, att_space);
string_att_write = static_cast<char *>(calloc(8192, sizeof(char)));
- HDmemset(string_att_write, 'A', 8191);
+ memset(string_att_write, 'A', 8191);
// Write data to the attribute, then read it back.
gr_attr.write(vlst, &string_att_write);
generated by cgit v0.12 at 2024-07-15 17:46:11 (GMT)