diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2004-07-17 05:24:58 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2004-07-17 05:24:58 (GMT) |
| commit | 0f985ebb0a107f5ab6d6426ca36683263f6d3ba8 (patch) | |
| tree | 619dbc2a177d3a529c884d896f8164d060382e10 /c++ | |
| parent | f81bf3b56fa1d62d2649ce8e08c34fbba433d179 (diff) | |
| download | hdf5-0f985ebb0a107f5ab6d6426ca36683263f6d3ba8.zip hdf5-0f985ebb0a107f5ab6d6426ca36683263f6d3ba8.tar.gz hdf5-0f985ebb0a107f5ab6d6426ca36683263f6d3ba8.tar.bz2 | |
[svn-r8894] Purpose: Fixing platform specific problem
Description:
Some platforms don't support std, and I missed handling that
situation in my last change for these files.
Solution:
Added 'using' statement where appropriate.
Platforms tested:
HPUX 11.00 (kelgia)
Linux 2.4 (eirene)
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/test/h5cpputil.cpp | 18 | ||||
| -rw-r--r-- | c++/test/h5cpputil.h | 6 |
2 files changed, 5 insertions, 19 deletions
diff --git a/c++/test/h5cpputil.cpp b/c++/test/h5cpputil.cpp index e9baf67..e1f3e90 100644 --- a/c++/test/h5cpputil.cpp +++ b/c++/test/h5cpputil.cpp @@ -31,8 +31,8 @@ using namespace std; #endif -#include "h5cpputil.h" #include "h5test.h" +#include "h5cpputil.h" /*------------------------------------------------------------------------- * Function: test_report @@ -72,19 +72,3 @@ int test_report( int nerrors, const string& testname ) } } -template <class Type1, class Type2> - void verify_val1(Type1 x, Type2 value, const char* message) -{ - if (GetTestVerbosity()>=VERBO_HI) - { - print_func(" Call to routine: %15s at line %4d in %s had value \ - %ld \n", (where), (int)__LINE__, __FILE__, (long)(x)); - } - if (x != value) - { - TestErrPrintf("*** UNEXPECTED VALUE from %s should be %s, but is %s \ - at line %4d in %s\n", where, val, x, (int)__LINE__, __FILE__); - H5Eprint (stdout); - } -} - diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h index 4131abf..2a269a9 100644 --- a/c++/test/h5cpputil.h +++ b/c++/test/h5cpputil.h @@ -25,6 +25,8 @@ #ifndef H5_NO_STD int test_report (int, const std::string&); +using std::cerr; +using std::endl; #else int test_report (int, const string&); #endif @@ -34,12 +36,12 @@ template <class Type> { if (GetTestVerbosity()>=VERBO_HI) { - cout << " Call to routine: " << where << " at line " << line + cerr << " Call to routine: " << where << " at line " << line << " in " << file_name << " had value " << x << endl; } if (x != value) { - cout << "*** UNEXPECTED VALUE from " << where << " should be " + cerr << "*** UNEXPECTED VALUE from " << where << " should be " << value << ", but is " << x << " at line " << line << " in " << file_name << endl; H5Eprint (stdout); |