summaryrefslogtreecommitdiffstats
path: root/hl/c++
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2013-07-08 15:52:49 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2013-07-08 15:52:49 (GMT)
commit528e0d1cac689310beecf02e56a10b764afa2651 (patch)
tree55b458aedb657440c0cd124f9d6d9f521153db6f /hl/c++
parent38bdc241ed4f62c9d628de563f6f98f3dda6281c (diff)
downloadhdf5-528e0d1cac689310beecf02e56a10b764afa2651.zip
hdf5-528e0d1cac689310beecf02e56a10b764afa2651.tar.gz
hdf5-528e0d1cac689310beecf02e56a10b764afa2651.tar.bz2
[svn-r23869] HDFFV-8302: replace (v)snprintf with _(v)snprintf for windows. Merge from trunk along with other windows functions and HD prefix corrections.
HDFFV-8394: Add cmake code to package examples Tested: local linux
Diffstat (limited to 'hl/c++')
-rw-r--r--hl/c++/test/ptableTest.cpp17
1 files changed, 17 insertions, 0 deletions
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp
index a2b5efd..929058d 100644
--- a/hl/c++/test/ptableTest.cpp
+++ b/hl/c++/test/ptableTest.cpp
@@ -183,9 +183,17 @@ int TestCompoundDatatype()
goto out;
PASSED();
+
+ H5Tclose(dtypeID);
return 0;
out:
+
+ H5E_BEGIN_TRY {
+ H5Tclose(dtypeID);
+ } H5E_END_TRY;
+
+
H5_FAILED();
return 1;
}
@@ -515,10 +523,19 @@ int SystemTest()
if(ct1[1].b != ct2[2].g.b)
goto out;
+ H5Tclose(dtypeID1);
+ H5Tclose(dtypeID2);
+
PASSED();
return 0;
out:
+
+ H5E_BEGIN_TRY {
+ H5Tclose(dtypeID1);
+ H5Tclose(dtypeID2);
+ } H5E_END_TRY;
+
H5_FAILED();
return 1;
}