From 51ea7245dfdbda8311961ea4755c8d9c8ce99d76 Mon Sep 17 00:00:00 2001 From: Binh-Minh Ribler Date: Mon, 14 Nov 2016 16:04:27 -0600 Subject: Description: Removed H5_NO_NAMESPACE from the examples. They were missed from the previous cleanup. Platforms tested: Linux/32 2.6 (jam) Linux/64 (platypus) --- c++/examples/chunks.cpp | 16 ++++------------ c++/examples/compound.cpp | 16 ++++------------ c++/examples/create.cpp | 7 ++----- c++/examples/extend_ds.cpp | 14 ++++---------- c++/examples/h5group.cpp | 16 ++++------------ c++/examples/h5tutr_cmprss.cpp | 13 ++++--------- c++/examples/h5tutr_crtatt.cpp | 6 +----- c++/examples/h5tutr_crtdat.cpp | 6 +----- c++/examples/h5tutr_crtgrp.cpp | 13 ++++--------- c++/examples/h5tutr_crtgrpar.cpp | 13 ++++--------- c++/examples/h5tutr_crtgrpd.cpp | 13 ++++--------- c++/examples/h5tutr_extend.cpp | 13 ++++--------- c++/examples/h5tutr_rdwt.cpp | 6 +----- c++/examples/h5tutr_subset.cpp | 13 ++++--------- c++/examples/readdata.cpp | 16 ++++------------ c++/examples/writedata.cpp | 16 ++++------------ 16 files changed, 53 insertions(+), 144 deletions(-) diff --git a/c++/examples/chunks.cpp b/c++/examples/chunks.cpp index 286934a..57b23fd 100644 --- a/c++/examples/chunks.cpp +++ b/c++/examples/chunks.cpp @@ -23,20 +23,12 @@ #else #include #endif -#include - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cout; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cout; +using std::endl; +#include #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif +using namespace H5; const H5std_string FILE_NAME( "SDSextendible.h5" ); const H5std_string DATASET_NAME( "ExtendibleArray" ); diff --git a/c++/examples/compound.cpp b/c++/examples/compound.cpp index dfc5d81..7e14244 100644 --- a/c++/examples/compound.cpp +++ b/c++/examples/compound.cpp @@ -24,20 +24,12 @@ #else #include #endif -#include - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cout; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cout; +using std::endl; +#include #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif +using namespace H5; const H5std_string FILE_NAME( "SDScompound.h5" ); const H5std_string DATASET_NAME( "ArrayOfStructures" ); diff --git a/c++/examples/create.cpp b/c++/examples/create.cpp index b4cc768..1930987 100644 --- a/c++/examples/create.cpp +++ b/c++/examples/create.cpp @@ -22,13 +22,10 @@ #else #include #endif -#include +#include #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif +using namespace H5; const H5std_string FILE_NAME( "SDS.h5" ); const H5std_string DATASET_NAME( "IntArray" ); diff --git a/c++/examples/extend_ds.cpp b/c++/examples/extend_ds.cpp index 2723263..f3f9a90 100644 --- a/c++/examples/extend_ds.cpp +++ b/c++/examples/extend_ds.cpp @@ -27,18 +27,12 @@ #endif #include -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cout; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cout; +using std::endl; +#include #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif +using namespace H5; const H5std_string FILE_NAME( "SDSextendible.h5" ); const H5std_string DATASET_NAME( "ExtendibleArray" ); diff --git a/c++/examples/h5group.cpp b/c++/examples/h5group.cpp index a5137bc..58ee44d 100644 --- a/c++/examples/h5group.cpp +++ b/c++/examples/h5group.cpp @@ -27,20 +27,12 @@ #else #include #endif -#include - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cout; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cout; +using std::endl; +#include #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif +using namespace H5; const H5std_string FILE_NAME( "Group.h5" ); const int RANK = 2; diff --git a/c++/examples/h5tutr_cmprss.cpp b/c++/examples/h5tutr_cmprss.cpp index e9c87f1..5460191 100644 --- a/c++/examples/h5tutr_cmprss.cpp +++ b/c++/examples/h5tutr_cmprss.cpp @@ -19,17 +19,12 @@ */ #include -#include +using std::cout; +using std::endl; +#include #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#ifndef H5_NO_STD - using std::cout; - using std::endl; -#endif // H5_NO_STD -#endif +using namespace H5; const H5std_string FILE_NAME("h5tutr_cmprss.h5"); const H5std_string DATASET_NAME("Compressed_Data"); diff --git a/c++/examples/h5tutr_crtatt.cpp b/c++/examples/h5tutr_crtatt.cpp index df8ca5a..a53bb1c 100644 --- a/c++/examples/h5tutr_crtatt.cpp +++ b/c++/examples/h5tutr_crtatt.cpp @@ -20,12 +20,8 @@ #include #include - #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif +using namespace H5; const H5std_string FILE_NAME( "h5tutr_dset.h5" ); const H5std_string DATASET_NAME( "dset" ); diff --git a/c++/examples/h5tutr_crtdat.cpp b/c++/examples/h5tutr_crtdat.cpp index c767f72..b50b659 100644 --- a/c++/examples/h5tutr_crtdat.cpp +++ b/c++/examples/h5tutr_crtdat.cpp @@ -20,12 +20,8 @@ #include #include - #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif +using namespace H5; const H5std_string FILE_NAME("h5tutr_dset.h5"); const H5std_string DATASET_NAME("dset"); diff --git a/c++/examples/h5tutr_crtgrp.cpp b/c++/examples/h5tutr_crtgrp.cpp index 3db4e72..41bbf1b 100644 --- a/c++/examples/h5tutr_crtgrp.cpp +++ b/c++/examples/h5tutr_crtgrp.cpp @@ -19,17 +19,12 @@ */ #include -#include +using std::cout; +using std::endl; +#include #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#ifndef H5_NO_STD - using std::cout; - using std::endl; -#endif // H5_NO_STD -#endif +using namespace H5; const H5std_string FILE_NAME("h5tutr_group.h5"); diff --git a/c++/examples/h5tutr_crtgrpar.cpp b/c++/examples/h5tutr_crtgrpar.cpp index f6e031f..a050e3c 100644 --- a/c++/examples/h5tutr_crtgrpar.cpp +++ b/c++/examples/h5tutr_crtgrpar.cpp @@ -19,17 +19,12 @@ */ #include -#include +using std::cout; +using std::endl; +#include #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#ifndef H5_NO_STD - using std::cout; - using std::endl; -#endif // H5_NO_STD -#endif +using namespace H5; const H5std_string FILE_NAME("h5tutr_groups.h5"); diff --git a/c++/examples/h5tutr_crtgrpd.cpp b/c++/examples/h5tutr_crtgrpd.cpp index f0bde52..12de485 100644 --- a/c++/examples/h5tutr_crtgrpd.cpp +++ b/c++/examples/h5tutr_crtgrpd.cpp @@ -19,17 +19,12 @@ */ #include -#include +using std::cout; +using std::endl; +#include #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#ifndef H5_NO_STD - using std::cout; - using std::endl; -#endif // H5_NO_STD -#endif +using namespace H5; const H5std_string FILE_NAME("h5tutr_groups.h5"); const H5std_string DATASET_NAME1("/MyGroup/dset1"); diff --git a/c++/examples/h5tutr_extend.cpp b/c++/examples/h5tutr_extend.cpp index 432ca5e..8f80266 100644 --- a/c++/examples/h5tutr_extend.cpp +++ b/c++/examples/h5tutr_extend.cpp @@ -19,17 +19,12 @@ */ #include -#include +using std::cout; +using std::endl; +#include #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#ifndef H5_NO_STD - using std::cout; - using std::endl; -#endif // H5_NO_STD -#endif +using namespace H5; const H5std_string FILE_NAME("h5tutr_extend.h5"); const H5std_string DATASETNAME("ExtendibleArray"); diff --git a/c++/examples/h5tutr_rdwt.cpp b/c++/examples/h5tutr_rdwt.cpp index 68c28ca..5c83dcb 100644 --- a/c++/examples/h5tutr_rdwt.cpp +++ b/c++/examples/h5tutr_rdwt.cpp @@ -20,12 +20,8 @@ #include #include - #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif +using namespace H5; const H5std_string FILE_NAME("h5tutr_dset.h5"); const H5std_string DATASET_NAME("dset"); diff --git a/c++/examples/h5tutr_subset.cpp b/c++/examples/h5tutr_subset.cpp index ad52747..bf57713 100644 --- a/c++/examples/h5tutr_subset.cpp +++ b/c++/examples/h5tutr_subset.cpp @@ -19,17 +19,12 @@ */ #include -#include +using std::cout; +using std::endl; +#include #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#ifndef H5_NO_STD - using std::cout; - using std::endl; -#endif // H5_NO_STD -#endif +using namespace H5; const H5std_string FILE_NAME("h5tutr_subset.h5"); const H5std_string DATASET_NAME("IntArray"); diff --git a/c++/examples/readdata.cpp b/c++/examples/readdata.cpp index b615a40..74b02f9 100644 --- a/c++/examples/readdata.cpp +++ b/c++/examples/readdata.cpp @@ -24,20 +24,12 @@ #else #include #endif -#include - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cout; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cout; +using std::endl; +#include #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif +using namespace H5; const H5std_string FILE_NAME( "SDS.h5" ); const H5std_string DATASET_NAME( "IntArray" ); diff --git a/c++/examples/writedata.cpp b/c++/examples/writedata.cpp index 496c5d1..c3a5f48 100644 --- a/c++/examples/writedata.cpp +++ b/c++/examples/writedata.cpp @@ -27,20 +27,12 @@ #else #include #endif -#include - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cout; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cout; +using std::endl; +#include #include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif +using namespace H5; const H5std_string FILE_NAME( "Select.h5" ); const H5std_string DATASET_NAME( "Matrix in file" ); -- cgit v0.12