diff options
Diffstat (limited to 'c++/examples')
| -rw-r--r-- | c++/examples/chunks.cpp | 4 | ||||
| -rw-r--r-- | c++/examples/compound.cpp | 4 | ||||
| -rw-r--r-- | c++/examples/create.cpp | 9 | ||||
| -rw-r--r-- | c++/examples/extend_ds.cpp | 4 | ||||
| -rw-r--r-- | c++/examples/h5group.cpp | 4 | ||||
| -rw-r--r-- | c++/examples/readdata.cpp | 4 | ||||
| -rw-r--r-- | c++/examples/writedata.cpp | 4 |
7 files changed, 14 insertions, 19 deletions
diff --git a/c++/examples/chunks.cpp b/c++/examples/chunks.cpp index 99f386b..2955820 100644 --- a/c++/examples/chunks.cpp +++ b/c++/examples/chunks.cpp @@ -26,7 +26,6 @@ #ifndef H5_NO_NAMESPACE #ifndef H5_NO_STD - using std::string; using std::cout; using std::endl; #endif // H5_NO_STD @@ -35,7 +34,8 @@ #include "H5Cpp.h" #ifndef H5_NO_NAMESPACE -using namespace H5; + using namespace H5; + using H5_std::string; #endif const string FILE_NAME( "SDSextendible.h5" ); diff --git a/c++/examples/compound.cpp b/c++/examples/compound.cpp index 37df231..994a036 100644 --- a/c++/examples/compound.cpp +++ b/c++/examples/compound.cpp @@ -27,7 +27,6 @@ #ifndef H5_NO_NAMESPACE #ifndef H5_NO_STD - using std::string; using std::cout; using std::endl; #endif // H5_NO_STD @@ -36,7 +35,8 @@ #include "H5Cpp.h" #ifndef H5_NO_NAMESPACE -using namespace H5; + using namespace H5; + using H5_std::string; #endif const string FILE_NAME( "SDScompound.h5" ); diff --git a/c++/examples/create.cpp b/c++/examples/create.cpp index 85afc89..03cbb51 100644 --- a/c++/examples/create.cpp +++ b/c++/examples/create.cpp @@ -23,16 +23,11 @@ #endif #include <string> -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::string; -#endif // H5_NO_STD -#endif - #include "H5Cpp.h" #ifndef H5_NO_NAMESPACE -using namespace H5; + using namespace H5; + using H5_std::string; #endif const string FILE_NAME( "SDS.h5" ); diff --git a/c++/examples/extend_ds.cpp b/c++/examples/extend_ds.cpp index 5ec6448..81fb515 100644 --- a/c++/examples/extend_ds.cpp +++ b/c++/examples/extend_ds.cpp @@ -28,7 +28,6 @@ #ifndef H5_NO_NAMESPACE #ifndef H5_NO_STD - using std::string; using std::cout; using std::endl; #endif // H5_NO_STD @@ -37,7 +36,8 @@ #include "H5Cpp.h" #ifndef H5_NO_NAMESPACE -using namespace H5; + using namespace H5; + using H5_std::string; #endif const string FILE_NAME( "SDSextendible.h5" ); diff --git a/c++/examples/h5group.cpp b/c++/examples/h5group.cpp index 437ba17..cd0eeb0 100644 --- a/c++/examples/h5group.cpp +++ b/c++/examples/h5group.cpp @@ -30,7 +30,6 @@ #ifndef H5_NO_NAMESPACE #ifndef H5_NO_STD - using std::string; using std::cout; using std::endl; #endif // H5_NO_STD @@ -39,7 +38,8 @@ #include "H5Cpp.h" #ifndef H5_NO_NAMESPACE -using namespace H5; + using namespace H5; + using H5_std::string; #endif const string FILE_NAME( "Group.h5" ); diff --git a/c++/examples/readdata.cpp b/c++/examples/readdata.cpp index 8f00e33..7e10a55 100644 --- a/c++/examples/readdata.cpp +++ b/c++/examples/readdata.cpp @@ -27,7 +27,6 @@ #ifndef H5_NO_NAMESPACE #ifndef H5_NO_STD - using std::string; using std::cout; using std::endl; #endif // H5_NO_STD @@ -36,7 +35,8 @@ #include "H5Cpp.h" #ifndef H5_NO_NAMESPACE -using namespace H5; + using namespace H5; + using H5_std::string; #endif const string FILE_NAME( "SDS.h5" ); diff --git a/c++/examples/writedata.cpp b/c++/examples/writedata.cpp index 388939d..24e4768 100644 --- a/c++/examples/writedata.cpp +++ b/c++/examples/writedata.cpp @@ -30,7 +30,6 @@ #ifndef H5_NO_NAMESPACE #ifndef H5_NO_STD - using std::string; using std::cout; using std::endl; #endif // H5_NO_STD @@ -39,7 +38,8 @@ #include "H5Cpp.h" #ifndef H5_NO_NAMESPACE -using namespace H5; + using namespace H5; + using H5_std::string; #endif const string FILE_NAME( "Select.h5" ); |