[svn-r12201] Purpose: Maintenance

Description:
    Changed to alias string instead of std, i.e. H5std_string instead
    of H5std, because the old way wasn't working when std didn't exist.

Platforms tested:
    Linux 2.4 (heping)
    SunOS 5.8 64-bit (sol)
    HPUX 11.00 (kelgia) - this was the problematic platform but I wasn't
                                able to test before.
This commit is contained in:
Binh-Minh Ribler 2006-04-05 11:44:18 -05:00
parent 6f7076f47b
commit 69a959c55b
7 changed files with 18 additions and 25 deletions

View File

@ -35,11 +35,10 @@
#ifndef H5_NO_NAMESPACE
using namespace H5;
using H5_std::string;
#endif
const string FILE_NAME( "SDSextendible.h5" );
const string DATASET_NAME( "ExtendibleArray" );
const H5std_string FILE_NAME( "SDSextendible.h5" );
const H5std_string DATASET_NAME( "ExtendibleArray" );
const int NX = 10;
const int NY = 5;
const int RANK = 2;

View File

@ -36,14 +36,13 @@
#ifndef H5_NO_NAMESPACE
using namespace H5;
using H5_std::string;
#endif
const string FILE_NAME( "SDScompound.h5" );
const string DATASET_NAME( "ArrayOfStructures" );
const string MEMBER1( "a_name" );
const string MEMBER2( "b_name" );
const string MEMBER3( "c_name" );
const H5std_string FILE_NAME( "SDScompound.h5" );
const H5std_string DATASET_NAME( "ArrayOfStructures" );
const H5std_string MEMBER1( "a_name" );
const H5std_string MEMBER2( "b_name" );
const H5std_string MEMBER3( "c_name" );
const int LENGTH = 10;
const int RANK = 1;
@ -124,7 +123,7 @@ int main(void)
if( member1_class == H5T_FLOAT )
{
FloatType member2 = mtype1.getMemberFloatType( 2 );
string norm_string;
H5std_string norm_string;
H5T_norm_t norm = member2.getNorm( norm_string );
cout << "Normalization type is " << norm_string << endl;
}

View File

@ -27,11 +27,10 @@
#ifndef H5_NO_NAMESPACE
using namespace H5;
using H5_std::string;
#endif
const string FILE_NAME( "SDS.h5" );
const string DATASET_NAME( "IntArray" );
const H5std_string FILE_NAME( "SDS.h5" );
const H5std_string DATASET_NAME( "IntArray" );
const int NX = 5; // dataset dimensions
const int NY = 6;
const int RANK = 2;

View File

@ -37,11 +37,10 @@
#ifndef H5_NO_NAMESPACE
using namespace H5;
using H5_std::string;
#endif
const string FILE_NAME( "SDSextendible.h5" );
const string DATASET_NAME( "ExtendibleArray" );
const H5std_string FILE_NAME( "SDSextendible.h5" );
const H5std_string DATASET_NAME( "ExtendibleArray" );
const int NX = 10;
const int NY = 5;
const int RANK = 2;

View File

@ -39,10 +39,9 @@
#ifndef H5_NO_NAMESPACE
using namespace H5;
using H5_std::string;
#endif
const string FILE_NAME( "Group.h5" );
const H5std_string FILE_NAME( "Group.h5" );
const int RANK = 2;
// Operator function

View File

@ -36,11 +36,10 @@
#ifndef H5_NO_NAMESPACE
using namespace H5;
using H5_std::string;
#endif
const string FILE_NAME( "SDS.h5" );
const string DATASET_NAME( "IntArray" );
const H5std_string FILE_NAME( "SDS.h5" );
const H5std_string DATASET_NAME( "IntArray" );
const int NX_SUB = 3; // hyperslab dimensions
const int NY_SUB = 4;
const int NX = 7; // output buffer dimensions
@ -101,7 +100,7 @@ int main (void)
/*
* Get order of datatype and print message if it's a little endian.
*/
string order_string;
H5std_string order_string;
H5T_order_t order = intype.getOrder( order_string );
cout << order_string << endl;

View File

@ -39,11 +39,10 @@
#ifndef H5_NO_NAMESPACE
using namespace H5;
using H5_std::string;
#endif
const string FILE_NAME( "Select.h5" );
const string DATASET_NAME( "Matrix in file" );
const H5std_string FILE_NAME( "Select.h5" );
const H5std_string DATASET_NAME( "Matrix in file" );
const int MSPACE1_RANK = 1; // Rank of the first dataset in memory
const int MSPACE1_DIM = 50; // Dataset size in memory
const int MSPACE2_RANK = 1; // Rank of the second dataset in memory