diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2005-02-26 03:01:45 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2005-02-26 03:01:45 (GMT) |
| commit | 9748c5b0b1a18bc7dc4b56a024345425400e2ecf (patch) | |
| tree | 619b872cace3b12d999b2314f835cc45092b1787 | |
| parent | 8564d3654f102e8da966875e77685026016a4d35 (diff) | |
| download | hdf5-9748c5b0b1a18bc7dc4b56a024345425400e2ecf.zip hdf5-9748c5b0b1a18bc7dc4b56a024345425400e2ecf.tar.gz hdf5-9748c5b0b1a18bc7dc4b56a024345425400e2ecf.tar.bz2 | |
[svn-r10091] Purpose: Fix bug
Description:
Fixed typo in using namespace; it was mistakenly opening the namespace.
Platforms tested:
Linux 2.4 (heping)
SunOS 5.8 64-bit (sol)
| -rw-r--r-- | c++/test/h5cpputil.cpp | 14 | ||||
| -rw-r--r-- | c++/test/h5cpputil.h | 9 | ||||
| -rw-r--r-- | c++/test/tfile.cpp | 2 |
3 files changed, 3 insertions, 22 deletions
diff --git a/c++/test/h5cpputil.cpp b/c++/test/h5cpputil.cpp index d3f531b..7340ecc 100644 --- a/c++/test/h5cpputil.cpp +++ b/c++/test/h5cpputil.cpp @@ -32,16 +32,8 @@ #include "h5cpputil.h" #ifndef H5_NO_NAMESPACE -namespace H5 { -#ifndef H5_NO_STD - using namespace std; -#endif // H5_NO_STD +using namespace H5; #endif -/* -#ifndef H5_NO_STD -using namespace std; -#endif -*/ /*------------------------------------------------------------------------- @@ -126,7 +118,3 @@ InvalidActionException::InvalidActionException(const string func_name, const str //-------------------------------------------------------------------------- InvalidActionException::~InvalidActionException() {} -#ifndef H5_NO_NAMESPACE -} // end namespace -#endif - diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h index 5caba61..bef8f4a 100644 --- a/c++/test/h5cpputil.h +++ b/c++/test/h5cpputil.h @@ -24,10 +24,7 @@ #define _h5cpputil_h #ifndef H5_NO_NAMESPACE -namespace H5 { -#ifndef H5_NO_STD - using namespace std; -#endif // H5_NO_STD +using namespace H5; #endif #ifndef H5_NO_STD @@ -65,8 +62,4 @@ class InvalidActionException : public Exception { virtual ~InvalidActionException(); }; -#ifndef H5_NO_NAMESPACE -} -#endif - #endif diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp index 41cc1d3..74210ea 100644 --- a/c++/test/tfile.cpp +++ b/c++/test/tfile.cpp @@ -329,7 +329,7 @@ test_file_open(void) // Get the file-creation parameters hsize_t ublock = tmpl1.getUserblock(); verify_val((long)ublock, (long)F2_USERBLOCK_SIZE, "FileCreatPropList::getUserblock", __LINE__, __FILE__); - verify_val(ublock, F2_USERBLOCK_SIZE, "FileCreatPropList::getUserblock", __LINE__, __FILE__); + verify_val((long)ublock, (long)F2_USERBLOCK_SIZE, "FileCreatPropList::getUserblock", __LINE__, __FILE__); size_t parm1, parm2; // file-creation parameters tmpl1.getSizes( parm1, parm2); |