summaryrefslogtreecommitdiffstats
path: root/hl/c++
diff options
context:
space:
mode:
authorJames Laird <jlaird@hdfgroup.org>2005-05-05 16:51:46 (GMT)
committerJames Laird <jlaird@hdfgroup.org>2005-05-05 16:51:46 (GMT)
commit8570c314ef67c03f9b3ef9609c49cff7ee6488c0 (patch)
treea7c549f7c0900dede57abceb77809cba421deb9b /hl/c++
parenta78417597b82adc7841d1aa318e816e5e79422dd (diff)
downloadhdf5-8570c314ef67c03f9b3ef9609c49cff7ee6488c0.zip
hdf5-8570c314ef67c03f9b3ef9609c49cff7ee6488c0.tar.gz
hdf5-8570c314ef67c03f9b3ef9609c49cff7ee6488c0.tar.bz2
[svn-r10729] Purpose:
Cray X1 Port Description: Porting 1.7 branch to Cray X1. With these changes, HDF5 builds, but there are some errors in the tests. Working on the errors. Solution: Added nv1-cray file to config directory. Cleaned up some code in hl/c++ that was causing compiler to complain. Platforms tested: Cray X1, mir, sleipnir Misc. update:
Diffstat (limited to 'hl/c++')
-rw-r--r--hl/c++/test/ptableTest.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/hl/c++/test/ptableTest.cpp b/hl/c++/test/ptableTest.cpp
index efe4f10..9dc2bffe 100644
--- a/hl/c++/test/ptableTest.cpp
+++ b/hl/c++/test/ptableTest.cpp
@@ -172,6 +172,9 @@ out:
int TestGetNext()
{
int error;
+ int record;
+ int records[2];
+ int i;
TESTING("GetNextPacket")
@@ -181,15 +184,12 @@ int TestGetNext()
if(! wrapper.IsValid())
goto out;
- int record;
- int records[2];
-
/* Append 5 records to the dataset */
for(record = 1; record < 6; record++)
wrapper.AppendPacket(&record);
/* Ensure that we can interate through the records and get the right ones */
- for(int i = 1; i < 6; i++)
+ for(i = 1; i < 6; i++)
{
wrapper.GetNextPacket(&record);
if(record != i)
@@ -199,7 +199,7 @@ int TestGetNext()
wrapper.ResetIndex();
/* Ensure that we can interate through the records and get the right ones */
- for(int i = 1; i < 6; i++)
+ for(i = 1; i < 6; i++)
{
error = wrapper.GetNextPacket(&record);
if(record != i || error <0)
@@ -230,6 +230,7 @@ int TestGetPacket()
{
int record;
int theRecs[3];
+ int i;
TESTING("GetPacket")
/* Create a dataset */
@@ -249,7 +250,7 @@ int TestGetPacket()
/* Ensure that we can retrieve multiple records */
wrapper.GetPackets(1, 3, theRecs);
- for(int i = 0; i < 3; i++)
+ for(i = 0; i < 3; i++)
{
if(theRecs[i] != i+2)
goto out;