diff options
| author | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-03-17 17:20:07 (GMT) |
|---|---|---|
| committer | Bill Wendling <wendling@ncsa.uiuc.edu> | 2003-03-17 17:20:07 (GMT) |
| commit | a6b59791abe6c0dd03ffd70edb8fbe6460ad8971 (patch) | |
| tree | b6e2fc0fbccb7926b1bf50d9f86450197f80cead /c++ | |
| parent | e12c0353503aa10aac9eb085011339402f30aaeb (diff) | |
| download | hdf5-a6b59791abe6c0dd03ffd70edb8fbe6460ad8971.zip hdf5-a6b59791abe6c0dd03ffd70edb8fbe6460ad8971.tar.gz hdf5-a6b59791abe6c0dd03ffd70edb8fbe6460ad8971.tar.bz2 | |
[svn-r6485] Purpose:
Bug Fix
Description:
"using namespace std" isn't supported on HP-UX. We ahve the H5_NO_STD
flag begin set, but it wasn't being used.
Solution:
Added the check to the #ifdef line to see if H5_NO_STD is defined
before trying to use it in the program.
Platforms tested:
Kelgia
Diffstat (limited to 'c++')
| -rw-r--r-- | c++/examples/chunks.cpp | 2 | ||||
| -rw-r--r-- | c++/examples/compound.cpp | 2 | ||||
| -rw-r--r-- | c++/examples/create.cpp | 2 | ||||
| -rw-r--r-- | c++/examples/extend_ds.cpp | 2 | ||||
| -rw-r--r-- | c++/examples/h5group.cpp | 2 | ||||
| -rw-r--r-- | c++/examples/readdata.cpp | 2 | ||||
| -rw-r--r-- | c++/examples/writedata.cpp | 2 | ||||
| -rw-r--r-- | c++/src/H5Exception.cpp | 2 | ||||
| -rw-r--r-- | c++/src/H5Exception.h | 4 |
9 files changed, 12 insertions, 8 deletions
diff --git a/c++/examples/chunks.cpp b/c++/examples/chunks.cpp index 2f1d5a8..44d543e 100644 --- a/c++/examples/chunks.cpp +++ b/c++/examples/chunks.cpp @@ -18,7 +18,7 @@ */ #include <string> -#ifndef H5_NO_NAMESPACE +#if !defined(H5_NO_NAMESPACE) && !defined(H5_NO_STD) using namespace std; #endif diff --git a/c++/examples/compound.cpp b/c++/examples/compound.cpp index c480599..c559eb7 100644 --- a/c++/examples/compound.cpp +++ b/c++/examples/compound.cpp @@ -19,7 +19,7 @@ */ #include <string> -#ifndef H5_NO_NAMESPACE +#if !defined(H5_NO_NAMESPACE) && !defined(H5_NO_STD) using namespace std; #endif diff --git a/c++/examples/create.cpp b/c++/examples/create.cpp index 6ccba16..219d771 100644 --- a/c++/examples/create.cpp +++ b/c++/examples/create.cpp @@ -17,7 +17,7 @@ // #include <string> -#ifndef H5_NO_NAMESPACE +#if !defined(H5_NO_NAMESPACE) && !defined(H5_NO_STD) using namespace std; #endif diff --git a/c++/examples/extend_ds.cpp b/c++/examples/extend_ds.cpp index 0da1df4..f6f5691 100644 --- a/c++/examples/extend_ds.cpp +++ b/c++/examples/extend_ds.cpp @@ -20,7 +20,7 @@ */ #include <string> -#ifndef H5_NO_NAMESPACE +#if !defined(H5_NO_NAMESPACE) && !defined(H5_NO_STD) using namespace std; #endif diff --git a/c++/examples/h5group.cpp b/c++/examples/h5group.cpp index 6883c69..301d383 100644 --- a/c++/examples/h5group.cpp +++ b/c++/examples/h5group.cpp @@ -21,7 +21,7 @@ // the C version is used in this example. // #include <string> -#ifndef H5_NO_NAMESPACE +#if !defined(H5_NO_NAMESPACE) && !defined(H5_NO_STD) using namespace std; #endif diff --git a/c++/examples/readdata.cpp b/c++/examples/readdata.cpp index 7facebd..0805fa5 100644 --- a/c++/examples/readdata.cpp +++ b/c++/examples/readdata.cpp @@ -19,7 +19,7 @@ // #include <string> -#ifndef H5_NO_NAMESPACE +#if !defined(H5_NO_NAMESPACE) && !defined(H5_NO_STD) using namespace std; #endif diff --git a/c++/examples/writedata.cpp b/c++/examples/writedata.cpp index 1f503fa..ed0268b 100644 --- a/c++/examples/writedata.cpp +++ b/c++/examples/writedata.cpp @@ -22,7 +22,7 @@ */ #include <string> -#ifndef H5_NO_NAMESPACE +#if !defined(H5_NO_NAMESPACE) && !defined(H5_NO_STD) using namespace std; #endif diff --git a/c++/src/H5Exception.cpp b/c++/src/H5Exception.cpp index 81987c2..c61e252 100644 --- a/c++/src/H5Exception.cpp +++ b/c++/src/H5Exception.cpp @@ -23,7 +23,9 @@ #ifndef H5_NO_NAMESPACE namespace H5 { +#ifndef H5_NO_STD using namespace std; +#endif // H5_NO_STD #endif // Default constructor diff --git a/c++/src/H5Exception.h b/c++/src/H5Exception.h index 61fc261..a77400e 100644 --- a/c++/src/H5Exception.h +++ b/c++/src/H5Exception.h @@ -20,7 +20,9 @@ #ifndef H5_NO_NAMESPACE namespace H5 { -using namespace std; +#ifndef H5_NO_STD + using namespace std; +#endif // H5_NO_STD #endif class H5_DLLCPP Exception { |