diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2005-02-26 03:43:26 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2005-02-26 03:43:26 (GMT) |
| commit | 10df21a4017503cd6654c22ef97c24b6764d4641 (patch) | |
| tree | a7dd9633737245f6ba8dc9494eac8d0f4f226c65 /c++ | |
| parent | a5b452c417ce55b6f00725b29a26183eb5562ecc (diff) | |
| download | hdf5-10df21a4017503cd6654c22ef97c24b6764d4641.zip hdf5-10df21a4017503cd6654c22ef97c24b6764d4641.tar.gz hdf5-10df21a4017503cd6654c22ef97c24b6764d4641.tar.bz2 | |
[svn-r10093] Purpose: Fix bug
Description:
Fixed typo in using namespace; it was mistakenly opening the namespace.
Platforms tested:
Linux 2.4 (heping)
Very minor, and tested 3 platforms for 1.6 branch
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/test/h5cpputil.cpp | 14 | ||||
| -rw-r--r-- | c++/test/h5cpputil.h | 9 |
2 files changed, 2 insertions, 21 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 |