diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2016-10-19 20:50:17 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2016-10-19 20:50:17 (GMT) |
| commit | a903cbafa863f22d360e7ef59f787b4fe0c0d2c3 (patch) | |
| tree | ffcd2e4953ebf5e86621a904aba4cc8207b24185 /c++/src/H5DataType.cpp | |
| parent | b6bb7c123a02570a33f02257d738e50195dbeb3a (diff) | |
| download | hdf5-a903cbafa863f22d360e7ef59f787b4fe0c0d2c3.zip hdf5-a903cbafa863f22d360e7ef59f787b4fe0c0d2c3.tar.gz hdf5-a903cbafa863f22d360e7ef59f787b4fe0c0d2c3.tar.bz2 | |
Description:
Removed obsolet macros from C++ API:
H5_NO_NAMESPACE, H5_NO_STD, __cplusplus
Leave OLD_HEADER_FILENAME because iostream.h might still be in use,
until further checking is done.
Platforms tested:
Linux/32 2.6 (jam)
Linux/64 (platypus)
Darwin (osx1010test)
Jelly
Diffstat (limited to 'c++/src/H5DataType.cpp')
| -rw-r--r-- | c++/src/H5DataType.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/c++/src/H5DataType.cpp b/c++/src/H5DataType.cpp index a36dc60..7dcd343 100644 --- a/c++/src/H5DataType.cpp +++ b/c++/src/H5DataType.cpp @@ -42,13 +42,9 @@ #include "H5File.h" #include "H5Attribute.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cerr; +using std::endl; //-------------------------------------------------------------------------- // Function: DataType default constructor @@ -133,7 +129,7 @@ DataType::DataType(const Attribute& attr, const void* ref, H5R_type_t ref_type, //-------------------------------------------------------------------------- // Function: DataType copy constructor -///\brief Copy constructor: makes a copy of the original DataType object. +///\brief Copy constructor: makes a copy of the original DataType object // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- DataType::DataType(const DataType& original) : H5Object(), id(original.id) @@ -783,6 +779,4 @@ DataType::~DataType() cerr << inMemFunc("~DataType - ") << close_error.getDetailMsg() << endl; } } -#ifndef H5_NO_NAMESPACE } // end namespace -#endif |