summaryrefslogtreecommitdiffstats
path: root/c++/test/tfile.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'c++/test/tfile.cpp')
-rw-r--r--c++/test/tfile.cpp19
1 files changed, 9 insertions, 10 deletions
diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp
index 3541c2a..d68031a 100644
--- a/c++/test/tfile.cpp
+++ b/c++/test/tfile.cpp
@@ -41,7 +41,6 @@
#ifndef H5_NO_NAMESPACE
using namespace H5;
- using H5_std::string;
#endif
#include "h5cpputil.h" // C++ utilility header file
@@ -51,24 +50,24 @@ const size_t F1_OFFSET_SIZE = sizeof(haddr_t);
const size_t F1_LENGTH_SIZE = sizeof(hsize_t);
const unsigned F1_SYM_LEAF_K = 4;
const unsigned F1_SYM_INTERN_K = 16;
-const string FILE1("tfile1.h5");
+const H5std_string FILE1("tfile1.h5");
const hsize_t F2_USERBLOCK_SIZE = (hsize_t)512;
const size_t F2_OFFSET_SIZE = 8;
const size_t F2_LENGTH_SIZE = 8;
const unsigned F2_SYM_LEAF_K = 8;
const unsigned F2_SYM_INTERN_K = 32;
-const string FILE2("tfile2.h5");
+const H5std_string FILE2("tfile2.h5");
const hsize_t F3_USERBLOCK_SIZE = (hsize_t)0;
const size_t F3_OFFSET_SIZE = F2_OFFSET_SIZE;
const size_t F3_LENGTH_SIZE = F2_LENGTH_SIZE;
const unsigned F3_SYM_LEAF_K = F2_SYM_LEAF_K;
const unsigned F3_SYM_INTERN_K = F2_SYM_INTERN_K;
-const string FILE3("tfile3.h5");
+const H5std_string FILE3("tfile3.h5");
const int KB = 1024;
-const string FILE4("tfile4.h5");
+const H5std_string FILE4("tfile4.h5");
/*-------------------------------------------------------------------------
@@ -404,10 +403,10 @@ test_file_size(void)
const int RANK = 2;
const int NX = 4;
const int NY = 5;
-const string GROUPNAME ("group");
-const string DSETNAME ("dataset");
-const string ATTRNAME ("attribute");
-const string DTYPENAME ("compound");
+const H5std_string GROUPNAME ("group");
+const H5std_string DSETNAME ("dataset");
+const H5std_string ATTRNAME ("attribute");
+const H5std_string DTYPENAME ("compound");
// Compound datatype
typedef struct s1_t {
@@ -421,7 +420,7 @@ test_file_name()
// Output message about test being performed
MESSAGE(5, ("Testing File Name\n"));
- string file_name;
+ H5std_string file_name;
try {
// Create a file using default properties.
H5File file4(FILE4, H5F_ACC_TRUNC);