diff options
| author | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2016-10-26 15:45:59 (GMT) |
|---|---|---|
| committer | Binh-Minh Ribler <bmribler@hdfgroup.org> | 2016-10-26 15:45:59 (GMT) |
| commit | 581c0acfa9eb1eb6cb22d8973f7f0aec973b9e06 (patch) | |
| tree | c59a48ec2f5f3e5fedc02fa6c849c0c83c3da001 /c++ | |
| parent | 3b1b2f42df9fe0579b441f4e57f0838017814266 (diff) | |
| parent | a903cbafa863f22d360e7ef59f787b4fe0c0d2c3 (diff) | |
| download | hdf5-581c0acfa9eb1eb6cb22d8973f7f0aec973b9e06.zip hdf5-581c0acfa9eb1eb6cb22d8973f7f0aec973b9e06.tar.gz hdf5-581c0acfa9eb1eb6cb22d8973f7f0aec973b9e06.tar.bz2 | |
Merge pull request #89 in HDFFV/hdf5 from ~BMRIBLER/hdf5_bmr_obsolete_items:develop to develop
* commit 'a903cbafa863f22d360e7ef59f787b4fe0c0d2c3':
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++')
74 files changed, 109 insertions, 528 deletions
diff --git a/c++/src/H5AbstractDs.cpp b/c++/src/H5AbstractDs.cpp index ac10bf8..49de4bb 100644 --- a/c++/src/H5AbstractDs.cpp +++ b/c++/src/H5AbstractDs.cpp @@ -30,9 +30,7 @@ #include "H5AbstractDs.h" #include "H5Alltypes.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif //-------------------------------------------------------------------------- // Function: AbstractDs default constructor @@ -327,6 +325,4 @@ VarLenType AbstractDs::getVarLenType() const //-------------------------------------------------------------------------- AbstractDs::~AbstractDs() {} -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5AbstractDs.h b/c++/src/H5AbstractDs.h index 6975d6f..1b4775c 100644 --- a/c++/src/H5AbstractDs.h +++ b/c++/src/H5AbstractDs.h @@ -17,9 +17,7 @@ #ifndef __AbstractDs_H #define __AbstractDs_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif class ArrayType; class CompType; @@ -94,7 +92,5 @@ class H5_DLLCPP AbstractDs { // This member function is implemented by DataSet and Attribute - pure virtual. virtual hid_t p_get_type() const = 0; }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __AbstractDs_H diff --git a/c++/src/H5ArrayType.cpp b/c++/src/H5ArrayType.cpp index 9646a6f..0bdd09c 100644 --- a/c++/src/H5ArrayType.cpp +++ b/c++/src/H5ArrayType.cpp @@ -26,9 +26,7 @@ #include "H5DataType.h" #include "H5ArrayType.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif //-------------------------------------------------------------------------- // Function: ArrayType default constructor @@ -154,6 +152,4 @@ int ArrayType::getArrayDims(hsize_t* dims) const //-------------------------------------------------------------------------- ArrayType::~ArrayType() {} -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5ArrayType.h b/c++/src/H5ArrayType.h index aa7450c..0e9ef46 100644 --- a/c++/src/H5ArrayType.h +++ b/c++/src/H5ArrayType.h @@ -17,9 +17,7 @@ #ifndef __H5ArrayType_H #define __H5ArrayType_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class ArrayType \brief Class ArrayType inherits from DataType and provides wrappers for @@ -59,7 +57,5 @@ class H5_DLLCPP ArrayType : public DataType { // Default constructor ArrayType(); }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5ArrayType_H diff --git a/c++/src/H5AtomType.cpp b/c++/src/H5AtomType.cpp index 7871455..fa47e0c 100644 --- a/c++/src/H5AtomType.cpp +++ b/c++/src/H5AtomType.cpp @@ -26,9 +26,7 @@ #include "H5DataType.h" #include "H5AtomType.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif #ifndef DOXYGEN_SHOULD_SKIP_THIS //-------------------------------------------------------------------------- @@ -295,6 +293,4 @@ void AtomType::setPad( H5T_pad_t lsb, H5T_pad_t msb ) const AtomType::~AtomType() {} #endif // DOXYGEN_SHOULD_SKIP_THIS -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5AtomType.h b/c++/src/H5AtomType.h index 9798efc..d84b53f 100644 --- a/c++/src/H5AtomType.h +++ b/c++/src/H5AtomType.h @@ -17,9 +17,7 @@ #ifndef __H5AtomType_H #define __H5AtomType_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class AtomType \brief AtomType is a base class, inherited by IntType, FloatType, @@ -81,7 +79,5 @@ class H5_DLLCPP AtomType : public DataType { AtomType( const hid_t existing_id ); #endif // DOXYGEN_SHOULD_SKIP_THIS }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5AtomType_H diff --git a/c++/src/H5Attribute.cpp b/c++/src/H5Attribute.cpp index 0a8ec52..4daf174 100644 --- a/c++/src/H5Attribute.cpp +++ b/c++/src/H5Attribute.cpp @@ -38,13 +38,9 @@ #include "H5Attribute.h" #include "H5private.h" // for HDfree -#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; class H5_DLLCPP H5Object; // forward declaration for UserData4Aiterate @@ -644,6 +640,4 @@ Attribute::~Attribute() } } -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5Attribute.h b/c++/src/H5Attribute.h index 5455f76..c27bbdf 100644 --- a/c++/src/H5Attribute.h +++ b/c++/src/H5Attribute.h @@ -17,9 +17,7 @@ #ifndef __H5Attribute_H #define __H5Attribute_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class Attribute \brief Class Attribute operates on HDF5 attributes. @@ -104,7 +102,5 @@ class H5_DLLCPP Attribute : public AbstractDs, public H5Location { friend void f_Attribute_setId(Attribute* attr, hid_t new_id); }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5Attribute_H diff --git a/c++/src/H5Classes.h b/c++/src/H5Classes.h index acc0b98..bed0cae 100644 --- a/c++/src/H5Classes.h +++ b/c++/src/H5Classes.h @@ -17,9 +17,7 @@ #ifndef __H5Classes_H #define __H5Classes_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif class Exception; class IdComponent; class H5Location; @@ -45,7 +43,5 @@ namespace H5 { class H5File; class Attribute; class H5Library; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5Classes_H diff --git a/c++/src/H5CommonFG.cpp b/c++/src/H5CommonFG.cpp index f79a048..a1e0c3f 100644 --- a/c++/src/H5CommonFG.cpp +++ b/c++/src/H5CommonFG.cpp @@ -48,10 +48,7 @@ // GroupIException. // December 2000 -#ifndef H5_NO_NAMESPACE namespace H5 { -using namespace std; -#endif #ifndef DOXYGEN_SHOULD_SKIP_THIS //-------------------------------------------------------------------------- @@ -70,6 +67,4 @@ CommonFG::~CommonFG() {} #endif // DOXYGEN_SHOULD_SKIP_THIS -#ifndef H5_NO_NAMESPACE } -#endif diff --git a/c++/src/H5CommonFG.h b/c++/src/H5CommonFG.h index 956be21..a68d586 100644 --- a/c++/src/H5CommonFG.h +++ b/c++/src/H5CommonFG.h @@ -17,9 +17,7 @@ #ifndef __CommonFG_H #define __CommonFG_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class CommonFG \brief \a CommonFG was an abstract base class of H5File and H5Group. @@ -43,9 +41,6 @@ class H5_DLLCPP CommonFG { #endif // DOXYGEN_SHOULD_SKIP_THIS }; // end of CommonFG declaration - -#ifndef H5_NO_NAMESPACE } -#endif #endif // __CommonFG_H diff --git a/c++/src/H5CompType.cpp b/c++/src/H5CompType.cpp index b7c5687..784d171 100644 --- a/c++/src/H5CompType.cpp +++ b/c++/src/H5CompType.cpp @@ -30,9 +30,7 @@ #include "H5DataSet.h" #include "H5private.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif //-------------------------------------------------------------------------- // Function: CompType default constructor @@ -485,6 +483,4 @@ void CompType::setSize(size_t size) const //-------------------------------------------------------------------------- CompType::~CompType() {} -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5CompType.h b/c++/src/H5CompType.h index 8ecc8bf..6552f9e 100644 --- a/c++/src/H5CompType.h +++ b/c++/src/H5CompType.h @@ -17,9 +17,7 @@ #ifndef __H5CompType_H #define __H5CompType_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class CompType \brief CompType is a derivative of a DataType and operates on HDF5 @@ -114,7 +112,5 @@ class H5_DLLCPP CompType : public DataType { // getMemberXxxType hid_t p_get_member_type(unsigned member_num) const; }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5CompType_H diff --git a/c++/src/H5DataSet.cpp b/c++/src/H5DataSet.cpp index e4d6665..749a933 100644 --- a/c++/src/H5DataSet.cpp +++ b/c++/src/H5DataSet.cpp @@ -40,13 +40,9 @@ #include "H5DataSet.h" #include "H5private.h" // for HDfree -#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: DataSet default constructor @@ -850,6 +846,4 @@ DataSet::~DataSet() } } -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5DataSet.h b/c++/src/H5DataSet.h index dd98d26..ee9ef28 100644 --- a/c++/src/H5DataSet.h +++ b/c++/src/H5DataSet.h @@ -17,9 +17,7 @@ #ifndef __H5DataSet_H #define __H5DataSet_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class DataSet \brief Class DataSet operates on HDF5 datasets. @@ -133,7 +131,5 @@ class H5_DLLCPP DataSet : public H5Object, public AbstractDs { friend void f_DataSet_setId(DataSet* dset, hid_t new_id); }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5DataSet_H diff --git a/c++/src/H5DataSpace.cpp b/c++/src/H5DataSpace.cpp index b24e94f..cb479e1 100644 --- a/c++/src/H5DataSpace.cpp +++ b/c++/src/H5DataSpace.cpp @@ -25,13 +25,9 @@ #include "H5IdComponent.h" #include "H5DataSpace.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; #ifndef DOXYGEN_SHOULD_SKIP_THIS // This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control @@ -706,6 +702,4 @@ DataSpace::~DataSpace() } } -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5DataSpace.h b/c++/src/H5DataSpace.h index 38d8135..e76bc72 100644 --- a/c++/src/H5DataSpace.h +++ b/c++/src/H5DataSpace.h @@ -17,9 +17,7 @@ #ifndef __H5DataSpace_H #define __H5DataSpace_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class DataSpace \brief Class DataSpace inherits from IdComponent and provides wrappers for @@ -152,7 +150,5 @@ class H5_DLLCPP DataSpace : public IdComponent { #endif // DOXYGEN_SHOULD_SKIP_THIS }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5DataSpace_H 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 diff --git a/c++/src/H5DataType.h b/c++/src/H5DataType.h index e332cee..9ac6ecf 100644 --- a/c++/src/H5DataType.h +++ b/c++/src/H5DataType.h @@ -20,9 +20,7 @@ #ifndef __H5DataType_H #define __H5DataType_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class DataType \brief Class DataType provides generic operations on HDF5 datatypes. @@ -146,7 +144,5 @@ class H5_DLLCPP DataType : public H5Object { void p_commit(hid_t loc_id, const char* name); }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5DataType_H diff --git a/c++/src/H5DcreatProp.cpp b/c++/src/H5DcreatProp.cpp index d540c72..b307bde 100644 --- a/c++/src/H5DcreatProp.cpp +++ b/c++/src/H5DcreatProp.cpp @@ -25,9 +25,7 @@ #include "H5Object.h" #include "H5DataType.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif #ifndef DOXYGEN_SHOULD_SKIP_THIS // This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control @@ -747,6 +745,4 @@ void DSetCreatPropList::getExternal( unsigned idx, size_t name_size, char* name, //-------------------------------------------------------------------------- DSetCreatPropList::~DSetCreatPropList () {} -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5DcreatProp.h b/c++/src/H5DcreatProp.h index 07c9077..787d3ec 100644 --- a/c++/src/H5DcreatProp.h +++ b/c++/src/H5DcreatProp.h @@ -20,9 +20,7 @@ #ifndef __H5DSCreatPropList_H #define __H5DSCreatPropList_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif class DataType; @@ -147,7 +145,5 @@ class H5_DLLCPP DSetCreatPropList : public ObjCreatPropList { #endif // DOXYGEN_SHOULD_SKIP_THIS }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5DSCreatPropList_H diff --git a/c++/src/H5DxferProp.cpp b/c++/src/H5DxferProp.cpp index c228b44..7d9b943 100644 --- a/c++/src/H5DxferProp.cpp +++ b/c++/src/H5DxferProp.cpp @@ -22,9 +22,7 @@ #include "H5DxferProp.h" #include "H5private.h" // for HDmemset -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif #ifndef DOXYGEN_SHOULD_SKIP_THIS // This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control @@ -565,7 +563,5 @@ H5Z_EDC_t DSetMemXferPropList::getEDCCheck() const //-------------------------------------------------------------------------- DSetMemXferPropList::~DSetMemXferPropList() {} -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5DxferProp.h b/c++/src/H5DxferProp.h index a4af53c..81361cf 100644 --- a/c++/src/H5DxferProp.h +++ b/c++/src/H5DxferProp.h @@ -20,9 +20,7 @@ #ifndef __H5DSetMemXferPropList_H #define __H5DSetMemXferPropList_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class DSetMemXferPropList \brief Class DSetCreatPropList inherits from PropList and provides @@ -133,7 +131,5 @@ class H5_DLLCPP DSetMemXferPropList : public PropList { #endif // DOXYGEN_SHOULD_SKIP_THIS }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5DSetMemXferPropList_H diff --git a/c++/src/H5EnumType.cpp b/c++/src/H5EnumType.cpp index 32cb1ac..2b614a9 100644 --- a/c++/src/H5EnumType.cpp +++ b/c++/src/H5EnumType.cpp @@ -33,9 +33,7 @@ #include "H5EnumType.h" #include "H5private.h" // for HDmemset -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif //-------------------------------------------------------------------------- // Function: EnumType default constructor @@ -277,6 +275,4 @@ void EnumType::getMemberValue( unsigned memb_no, void *value ) const //-------------------------------------------------------------------------- EnumType::~EnumType() {} -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5EnumType.h b/c++/src/H5EnumType.h index bc5b870..1f96552 100644 --- a/c++/src/H5EnumType.h +++ b/c++/src/H5EnumType.h @@ -17,9 +17,7 @@ #ifndef __H5EnumType_H #define __H5EnumType_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class EnumType \brief EnumType is a derivative of a DataType and operates on HDF5 @@ -77,7 +75,5 @@ class H5_DLLCPP EnumType : public DataType { virtual ~EnumType(); }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5EnumType_H diff --git a/c++/src/H5Exception.cpp b/c++/src/H5Exception.cpp index 7b81066..2e23587 100644 --- a/c++/src/H5Exception.cpp +++ b/c++/src/H5Exception.cpp @@ -18,9 +18,7 @@ #include "H5Include.h" #include "H5Exception.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif const char Exception::DEFAULT_MSG[] = "No detailed information provided"; @@ -586,6 +584,5 @@ IdComponentException::IdComponentException(const H5std_string& func, const H5std ///\brief Noop destructor. //-------------------------------------------------------------------------- IdComponentException::~IdComponentException() throw() {} -#ifndef H5_NO_NAMESPACE + } // end namespace -#endif diff --git a/c++/src/H5Exception.h b/c++/src/H5Exception.h index d49c19a..da9066a 100644 --- a/c++/src/H5Exception.h +++ b/c++/src/H5Exception.h @@ -19,14 +19,12 @@ #include <string> -#ifndef H5_NO_NAMESPACE namespace H5 { #ifdef H5_NO_STD #define H5std_string ::string #else #define H5std_string std::string #endif -#endif /*! \class Exception \brief Exception provides wrappers of HDF5 error handling functions. @@ -171,8 +169,6 @@ class H5_DLLCPP IdComponentException : public Exception { virtual ~IdComponentException() throw(); }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5Exception_H diff --git a/c++/src/H5FaccProp.cpp b/c++/src/H5FaccProp.cpp index 972f915..c3919da 100644 --- a/c++/src/H5FaccProp.cpp +++ b/c++/src/H5FaccProp.cpp @@ -21,9 +21,7 @@ #include "H5PropList.h" #include "H5FaccProp.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif #ifndef DOXYGEN_SHOULD_SKIP_THIS // This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control @@ -748,6 +746,4 @@ void FileAccPropList::getLibverBounds(H5F_libver_t& libver_low, H5F_libver_t& li //-------------------------------------------------------------------------- FileAccPropList::~FileAccPropList() {} -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5FaccProp.h b/c++/src/H5FaccProp.h index e96d02f..a0605e0 100644 --- a/c++/src/H5FaccProp.h +++ b/c++/src/H5FaccProp.h @@ -20,9 +20,7 @@ #ifndef __H5FileAccPropList_H #define __H5FileAccPropList_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class FileAccPropList \brief Class FileAccPropList inherits from PropList and provides @@ -162,7 +160,5 @@ class H5_DLLCPP FileAccPropList : public PropList { #endif // DOXYGEN_SHOULD_SKIP_THIS }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5FileAccPropList_H diff --git a/c++/src/H5FcreatProp.cpp b/c++/src/H5FcreatProp.cpp index af51677..5a99dba 100644 --- a/c++/src/H5FcreatProp.cpp +++ b/c++/src/H5FcreatProp.cpp @@ -21,9 +21,7 @@ #include "H5PropList.h" #include "H5FcreatProp.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif #ifndef DOXYGEN_SHOULD_SKIP_THIS // This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control @@ -303,6 +301,4 @@ unsigned FileCreatPropList::getIstorek() const //-------------------------------------------------------------------------- FileCreatPropList::~FileCreatPropList() {} -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5FcreatProp.h b/c++/src/H5FcreatProp.h index b2a5c2b..1ac925e 100644 --- a/c++/src/H5FcreatProp.h +++ b/c++/src/H5FcreatProp.h @@ -17,9 +17,7 @@ #ifndef __H5FileCreatPropList_H #define __H5FileCreatPropList_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class FileCreatPropList \brief Class FileCreatPropList inherits from PropList and provides @@ -94,7 +92,5 @@ class H5_DLLCPP FileCreatPropList : public PropList { #endif // DOXYGEN_SHOULD_SKIP_THIS }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5FileCreatPropList_H diff --git a/c++/src/H5File.cpp b/c++/src/H5File.cpp index 246da9f..ff897d7 100644 --- a/c++/src/H5File.cpp +++ b/c++/src/H5File.cpp @@ -38,13 +38,9 @@ #include "H5File.h" #include "H5Alltypes.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#ifndef H5_NO_STD using std::cerr; using std::endl; -#endif // H5_NO_STD -#endif //-------------------------------------------------------------------------- // Function H5File default constructor @@ -658,6 +654,4 @@ H5File::~H5File() } } -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5File.h b/c++/src/H5File.h index 476c5b9..dca6c67 100644 --- a/c++/src/H5File.h +++ b/c++/src/H5File.h @@ -18,9 +18,7 @@ #define __H5File_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class H5File \brief Class H5File represents an HDF5 file and inherits from class Group @@ -123,8 +121,6 @@ class H5_DLLCPP H5File : public Group { void p_get_file( const char* name, unsigned int flags, const FileCreatPropList& create_plist, const FileAccPropList& access_plist ); }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5File_H diff --git a/c++/src/H5FloatType.cpp b/c++/src/H5FloatType.cpp index c019ae4..9ce06f7 100644 --- a/c++/src/H5FloatType.cpp +++ b/c++/src/H5FloatType.cpp @@ -32,9 +32,7 @@ #include "H5DataSet.h" #include "H5PredType.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif //-------------------------------------------------------------------------- // Function: FloatType default constructor @@ -285,6 +283,4 @@ void FloatType::setInpad( H5T_pad_t inpad ) const //-------------------------------------------------------------------------- FloatType::~FloatType() {} -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5FloatType.h b/c++/src/H5FloatType.h index ce816a4..c0119eb 100644 --- a/c++/src/H5FloatType.h +++ b/c++/src/H5FloatType.h @@ -17,9 +17,7 @@ #ifndef __H5FloatType_H #define __H5FloatType_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class FloatType \brief FloatType is a derivative of a DataType and operates on HDF5 @@ -74,7 +72,5 @@ class H5_DLLCPP FloatType : public AtomType { // Noop destructor. virtual ~FloatType(); }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5FloatType_H diff --git a/c++/src/H5Group.cpp b/c++/src/H5Group.cpp index 0e19e6f..20f14a3 100644 --- a/c++/src/H5Group.cpp +++ b/c++/src/H5Group.cpp @@ -40,13 +40,9 @@ #include "H5Alltypes.h" #include "H5private.h" // for HDstrcpy -#ifndef H5_NO_NAMESPACE namespace H5 { -#ifndef H5_NO_STD using std::cerr; using std::endl; -#endif // H5_NO_STD -#endif //-------------------------------------------------------------------------- // Function: Group default constructor @@ -231,6 +227,4 @@ Group::~Group() } } -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5Group.h b/c++/src/H5Group.h index b6ec425..5f4b0f3 100644 --- a/c++/src/H5Group.h +++ b/c++/src/H5Group.h @@ -17,9 +17,7 @@ #ifndef __Group_H #define __Group_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class Group \brief Class Group represents an HDF5 group. @@ -81,7 +79,5 @@ class H5_DLLCPP Group : public H5Object { hid_t id; // HDF5 group id }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __Group_H diff --git a/c++/src/H5IdComponent.cpp b/c++/src/H5IdComponent.cpp index 6d0c39f..d869b07 100644 --- a/c++/src/H5IdComponent.cpp +++ b/c++/src/H5IdComponent.cpp @@ -22,9 +22,7 @@ #include "H5DataSpace.h" #include "H5private.h" // for HDmemset -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif // This flag indicates whether H5Library::initH5cpp has been called to register // the terminating functions with atexit() @@ -352,6 +350,4 @@ bool IdComponent::p_valid_id(const hid_t obj_id) #endif // DOXYGEN_SHOULD_SKIP_THIS -#ifndef H5_NO_NAMESPACE } -#endif diff --git a/c++/src/H5IdComponent.h b/c++/src/H5IdComponent.h index 92765f2..d3d9b9f 100644 --- a/c++/src/H5IdComponent.h +++ b/c++/src/H5IdComponent.h @@ -17,9 +17,7 @@ #ifndef __IdComponent_H #define __IdComponent_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif class DataSpace; /*! \class IdComponent @@ -118,7 +116,5 @@ class H5_DLLCPP IdComponent { }; // end class IdComponent -#ifndef H5_NO_NAMESPACE } -#endif #endif // __IdComponent_H diff --git a/c++/src/H5IntType.cpp b/c++/src/H5IntType.cpp index f934d26..69fbedb 100644 --- a/c++/src/H5IntType.cpp +++ b/c++/src/H5IntType.cpp @@ -32,10 +32,7 @@ #include "H5DataSet.h" #include "H5PredType.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif - //-------------------------------------------------------------------------- // Function: IntType default constructor @@ -136,6 +133,4 @@ void IntType::setSign( H5T_sign_t sign ) const //-------------------------------------------------------------------------- IntType::~IntType() {} -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5IntType.h b/c++/src/H5IntType.h index 362a7e3..54c0d57 100644 --- a/c++/src/H5IntType.h +++ b/c++/src/H5IntType.h @@ -17,9 +17,7 @@ #ifndef __H5IntType_H #define __H5IntType_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class IntType \brief IntType is a derivative of a DataType and operates on HDF5 @@ -56,7 +54,5 @@ class H5_DLLCPP IntType : public AtomType { // Noop destructor. virtual ~IntType(); }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5IntType_H diff --git a/c++/src/H5Library.cpp b/c++/src/H5Library.cpp index 09e0f7e..4d1f279 100644 --- a/c++/src/H5Library.cpp +++ b/c++/src/H5Library.cpp @@ -34,9 +34,7 @@ #include "H5DataSpace.h" #include "H5Library.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif //-------------------------------------------------------------------------- // Function: H5Library::open (static) @@ -255,12 +253,18 @@ void H5Library::setFreeListLimits(int reg_global_lim, int reg_list_lim, } } -// Default constructor - private +//-------------------------------------------------------------------------- +// Function: H5Library default constructor - private +///\brief Default constructor: Creates a stub H5Library object +// Programmer Binh-Minh Ribler - 2000 +//-------------------------------------------------------------------------- H5Library::H5Library(){} -// Destructor - private +//-------------------------------------------------------------------------- +// Function: H5Library destructor +///\brief Noop destructor +// Programmer Binh-Minh Ribler - 2000 +//-------------------------------------------------------------------------- H5Library::~H5Library(){} -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5Library.h b/c++/src/H5Library.h index 308881b..694b052 100644 --- a/c++/src/H5Library.h +++ b/c++/src/H5Library.h @@ -17,9 +17,7 @@ #ifndef __H5Library_H #define __H5Library_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class H5Library \brief Class H5Library operates the HDF5 library globably. @@ -72,7 +70,5 @@ class H5_DLLCPP H5Library { #endif // DOXYGEN_SHOULD_SKIP_THIS }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5Library_H diff --git a/c++/src/H5Location.cpp b/c++/src/H5Location.cpp index 6b5c63a..c31db02 100644 --- a/c++/src/H5Location.cpp +++ b/c++/src/H5Location.cpp @@ -35,9 +35,7 @@ #include "H5Alltypes.h" #include "H5private.h" // for HDmemset -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif #ifndef DOXYGEN_SHOULD_SKIP_THIS @@ -1972,6 +1970,4 @@ H5Location::~H5Location() {} #endif // DOXYGEN_SHOULD_SKIP_THIS -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5Location.h b/c++/src/H5Location.h index bd8075c..647904b 100644 --- a/c++/src/H5Location.h +++ b/c++/src/H5Location.h @@ -19,9 +19,7 @@ #include "H5Classes.h" // constains forward class declarations -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class H5Location \brief H5Location is an abstract base class, added in version 1.8.12. @@ -251,7 +249,5 @@ class H5_DLLCPP H5Location : public IdComponent { }; /* end class H5Location */ -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5Location_H diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp index 6b5edcf..4bce9b1 100644 --- a/c++/src/H5Object.cpp +++ b/c++/src/H5Object.cpp @@ -35,9 +35,7 @@ #include "H5Attribute.h" #include "H5private.h" // for HDmemset -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif #ifndef DOXYGEN_SHOULD_SKIP_THIS // userAttrOpWrpr simply interfaces between the user's function and the @@ -465,6 +463,4 @@ ssize_t H5Object::getObjName(H5std_string& obj_name, size_t len) const H5Object::~H5Object() {} #endif // DOXYGEN_SHOULD_SKIP_THIS -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5Object.h b/c++/src/H5Object.h index e570055..72a9f50 100644 --- a/c++/src/H5Object.h +++ b/c++/src/H5Object.h @@ -17,9 +17,7 @@ #ifndef __H5Object_H #define __H5Object_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class H5Object \brief Class H5Object is a bridge between H5Location and DataSet, DataType, @@ -132,7 +130,5 @@ class H5_DLLCPP H5Object : public H5Location { }; /* end class H5Object */ -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5Object_H diff --git a/c++/src/H5OcreatProp.cpp b/c++/src/H5OcreatProp.cpp index 54ce2ff..3cda945 100644 --- a/c++/src/H5OcreatProp.cpp +++ b/c++/src/H5OcreatProp.cpp @@ -22,9 +22,7 @@ #include "H5OcreatProp.h" #include "H5FaccProp.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif #ifndef DOXYGEN_SHOULD_SKIP_THIS // This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control @@ -217,6 +215,4 @@ unsigned ObjCreatPropList::getAttrCrtOrder() const //-------------------------------------------------------------------------- ObjCreatPropList::~ObjCreatPropList() {} -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5OcreatProp.h b/c++/src/H5OcreatProp.h index 0532b3c..bfba1c4 100644 --- a/c++/src/H5OcreatProp.h +++ b/c++/src/H5OcreatProp.h @@ -17,9 +17,7 @@ #ifndef __H5ObjCreatPropList_H #define __H5ObjCreatPropList_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class ObjCreatPropList \brief Class ObjCreatPropList inherits from PropList and provides @@ -75,7 +73,5 @@ class H5_DLLCPP ObjCreatPropList : public PropList { #endif // DOXYGEN_SHOULD_SKIP_THIS }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5ObjCreatPropList_H diff --git a/c++/src/H5PredType.cpp b/c++/src/H5PredType.cpp index 211702d..0711020 100644 --- a/c++/src/H5PredType.cpp +++ b/c++/src/H5PredType.cpp @@ -27,9 +27,7 @@ #include "H5AtomType.h" #include "H5PredType.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif #ifndef DOXYGEN_SHOULD_SKIP_THIS //-------------------------------------------------------------------------- @@ -889,9 +887,7 @@ const PredType& PredType::NATIVE_UINT_FAST64 = *NATIVE_UINT_FAST64_; #endif // DOXYGEN_SHOULD_SKIP_THIS -#ifndef H5_NO_NAMESPACE } // end namespace -#endif /*************************************************************************** Design Note diff --git a/c++/src/H5PredType.h b/c++/src/H5PredType.h index 1e789ef..750902e 100644 --- a/c++/src/H5PredType.h +++ b/c++/src/H5PredType.h @@ -17,9 +17,7 @@ #ifndef __H5PredType_H #define __H5PredType_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class PredType \brief Class PredType holds the definition of all the HDF5 predefined @@ -441,7 +439,5 @@ class H5_DLLCPP PredType : public AtomType { #endif // DOXYGEN_SHOULD_SKIP_THIS }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5PredType_H diff --git a/c++/src/H5PropList.cpp b/c++/src/H5PropList.cpp index 6655900..b6f7c15 100644 --- a/c++/src/H5PropList.cpp +++ b/c++/src/H5PropList.cpp @@ -28,13 +28,9 @@ #include "H5private.h" // for HDfree -#ifndef H5_NO_NAMESPACE namespace H5 { -#ifndef H5_NO_STD using std::cerr; using std::endl; -#endif // H5_NO_STD -#endif #ifndef DOXYGEN_SHOULD_SKIP_THIS // This DOXYGEN_SHOULD_SKIP_THIS block is a work-around approach to control @@ -752,6 +748,4 @@ PropList::~PropList() } } -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5PropList.h b/c++/src/H5PropList.h index dbd1263..faaf68d 100644 --- a/c++/src/H5PropList.h +++ b/c++/src/H5PropList.h @@ -17,9 +17,7 @@ #ifndef __H5PropList_H #define __H5PropList_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif //! Class PropList provides operations for generic property lists. /*! \class PropList @@ -139,7 +137,5 @@ class H5_DLLCPP PropList : public IdComponent { #endif // DOXYGEN_SHOULD_SKIP_THIS }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5PropList_H diff --git a/c++/src/H5StrType.cpp b/c++/src/H5StrType.cpp index db46596..962a5dc 100644 --- a/c++/src/H5StrType.cpp +++ b/c++/src/H5StrType.cpp @@ -32,9 +32,7 @@ #include "H5DataSet.h" #include "H5PredType.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif //-------------------------------------------------------------------------- // Function: StrType default constructor @@ -247,6 +245,4 @@ void StrType::setStrpad( H5T_str_t strpad ) const //-------------------------------------------------------------------------- StrType::~StrType() {} -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5StrType.h b/c++/src/H5StrType.h index eac6693..5d223b3 100644 --- a/c++/src/H5StrType.h +++ b/c++/src/H5StrType.h @@ -17,9 +17,7 @@ #ifndef __H5StrType_H #define __H5StrType_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class StrType \brief StrType is a derivative of a DataType and operates on HDF5 @@ -68,7 +66,5 @@ class H5_DLLCPP StrType : public AtomType { // Noop destructor. virtual ~StrType(); }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5StrType_H diff --git a/c++/src/H5VarLenType.cpp b/c++/src/H5VarLenType.cpp index c9f320a..fa3a18f 100644 --- a/c++/src/H5VarLenType.cpp +++ b/c++/src/H5VarLenType.cpp @@ -26,10 +26,7 @@ #include "H5DataType.h" #include "H5VarLenType.h" -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif - //-------------------------------------------------------------------------- // Function: VarLenType default constructor @@ -81,6 +78,4 @@ VarLenType::VarLenType(const DataType* base_type) : DataType() //-------------------------------------------------------------------------- VarLenType::~VarLenType() {} -#ifndef H5_NO_NAMESPACE } // end namespace -#endif diff --git a/c++/src/H5VarLenType.h b/c++/src/H5VarLenType.h index 4898135..d7141b0 100644 --- a/c++/src/H5VarLenType.h +++ b/c++/src/H5VarLenType.h @@ -17,9 +17,7 @@ #ifndef __H5VarLenType_H #define __H5VarLenType_H -#ifndef H5_NO_NAMESPACE namespace H5 { -#endif /*! \class VarLenType \brief VarLenType is a derivative of a DataType and operates on HDF5 @@ -48,7 +46,5 @@ class H5_DLLCPP VarLenType : public DataType { // Default constructor VarLenType(); }; -#ifndef H5_NO_NAMESPACE } -#endif #endif // __H5VarLenType_H diff --git a/c++/test/dsets.cpp b/c++/test/dsets.cpp index 5d0c8a1..8752744 100644 --- a/c++/test/dsets.cpp +++ b/c++/test/dsets.cpp @@ -30,21 +30,14 @@ #else #include <iostream> #endif -#include <string> - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cerr; +using std::endl; +#include <string> #include "H5Cpp.h" // C++ API header file +using namespace H5; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif - +#include "h5test.h" #include "h5cpputil.h" // C++ utilility header file const H5std_string FILE1("dataset.h5"); @@ -1175,9 +1168,7 @@ test_types(H5File& file) * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void test_dset() { hid_t fapl_id; @@ -1235,9 +1226,7 @@ void test_dset() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void cleanup_dsets() { HDremove(FILE1.c_str()); diff --git a/c++/test/h5cpputil.cpp b/c++/test/h5cpputil.cpp index 3bc38b5..95d29a8 100644 --- a/c++/test/h5cpputil.cpp +++ b/c++/test/h5cpputil.cpp @@ -26,25 +26,16 @@ #else #include <iostream> #endif -#include <string> +using std::cerr; +using std::endl; -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif +#include <string> +#include "H5Cpp.h" // C++ API header file +using namespace H5; #include "h5test.h" -#include "H5Cpp.h" - -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif - -#include "h5cpputil.h" +#include "h5cpputil.h" // C++ utilility header file - /*------------------------------------------------------------------------- * Function: test_report * diff --git a/c++/test/h5cpputil.h b/c++/test/h5cpputil.h index 0a3221d..f8aaec7 100644 --- a/c++/test/h5cpputil.h +++ b/c++/test/h5cpputil.h @@ -26,14 +26,9 @@ #include "h5test.h" -#ifndef H5_NO_NAMESPACE using namespace H5; -#endif - -#ifndef H5_NO_STD using std::cerr; using std::endl; -#endif #define MESSAGE(V,A) {if (HDGetTestVerbosity()>(V)) print_func A;} #define SUBTEST(TEST) {printf(" Subtest: %-52s",TEST); fflush(stdout);} diff --git a/c++/test/tarray.cpp b/c++/test/tarray.cpp index 441ef81..7fe2e6b 100644 --- a/c++/test/tarray.cpp +++ b/c++/test/tarray.cpp @@ -18,27 +18,19 @@ tarray.cpp - HDF5 C++ testing the array datatype functionality ***************************************************************************/ - #ifdef OLD_HEADER_FILENAME #include <iostream.h> #else #include <iostream> #endif -#include <string> - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cerr; +using std::endl; +#include <string> #include "H5Cpp.h" // C++ API header file +using namespace H5; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif - +#include "h5test.h" #include "h5cpputil.h" // C++ utilility header file const H5std_string FILENAME("tarray.h5"); @@ -478,9 +470,7 @@ static void test_array_info() ** test_array(): Main datatypes testing routine. ** ****************************************************************/ -#ifdef __cplusplus extern "C" -#endif void test_array() { // Output message about test being performed @@ -512,9 +502,7 @@ void test_array() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void cleanup_array() { HDremove(FILENAME.c_str()); diff --git a/c++/test/tattr.cpp b/c++/test/tattr.cpp index 2dfa562..bc46d0f 100644 --- a/c++/test/tattr.cpp +++ b/c++/test/tattr.cpp @@ -19,28 +19,20 @@ C attribute interface (H5A) ***************************************************************************/ - #ifdef OLD_HEADER_FILENAME #include <iostream.h> #else #include <iostream> #endif -#include <string> - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif - -#include "H5Cpp.h" // C++ API header file +using std::cerr; +using std::endl; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif +#include <string> +#include "H5Cpp.h" // C++ API header file +using namespace H5; -#include "h5cpputil.h" // C++ utilility header file +#include "h5test.h" +#include "h5cpputil.h" // C++ utilility header file const H5std_string FILE_BASIC("tattr_basic.h5"); const H5std_string FILE_COMPOUND("tattr_compound.h5"); @@ -1786,9 +1778,7 @@ static void test_attr_corder_create_basic(FileCreatPropList& fcpl, ** test_attr(): Main attribute testing routine. ** ****************************************************************/ -#ifdef __cplusplus extern "C" -#endif void test_attr() { // Output message about test being performed @@ -1885,9 +1875,7 @@ void test_attr() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void cleanup_attr() { HDremove(FILE_BASIC.c_str()); diff --git a/c++/test/tcompound.cpp b/c++/test/tcompound.cpp index e08c81d..f49ebb2 100644 --- a/c++/test/tcompound.cpp +++ b/c++/test/tcompound.cpp @@ -18,27 +18,19 @@ tcompound.cpp - HDF5 C++ testing the compound data type functionality ***************************************************************************/ - #ifdef OLD_HEADER_FILENAME #include <iostream.h> #else #include <iostream> #endif -#include <string> - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cerr; +using std::endl; +#include <string> #include "H5Cpp.h" // C++ API header file +using namespace H5; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif - +#include "h5test.h" #include "h5cpputil.h" // C++ utilility header file /* Number of elements in each test */ @@ -832,9 +824,7 @@ static void test_compound_set_size() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void test_compound() { // Output message about test being performed @@ -862,9 +852,7 @@ void test_compound() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void cleanup_compound() { HDremove(COMPFILE.c_str()); diff --git a/c++/test/tdspl.cpp b/c++/test/tdspl.cpp index ab93c26..d733ffe 100644 --- a/c++/test/tdspl.cpp +++ b/c++/test/tdspl.cpp @@ -19,27 +19,19 @@ list functionality ***************************************************************************/ - #ifdef OLD_HEADER_FILENAME #include <iostream.h> #else #include <iostream> #endif -#include <string> - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cerr; +using std::endl; +#include <string> #include "H5Cpp.h" // C++ API header file +using namespace H5; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif - +#include "h5test.h" #include "h5cpputil.h" // C++ utilility header file const H5std_string FILENAME("tdatatransform.h5"); @@ -126,9 +118,7 @@ static void test_transfplist() ** test_dsproplist(): Main dataset property list testing routine. ** ****************************************************************/ -#ifdef __cplusplus extern "C" -#endif void test_dsproplist() { // Output message about test being performed @@ -138,10 +128,7 @@ void test_dsproplist() } // test_dsproplist() - -#ifdef __cplusplus extern "C" -#endif void cleanup_dsproplist() { HDremove(FILENAME.c_str()); diff --git a/c++/test/testhdf5.cpp b/c++/test/testhdf5.cpp index 4fe4b58..28ede6b 100644 --- a/c++/test/testhdf5.cpp +++ b/c++/test/testhdf5.cpp @@ -40,28 +40,19 @@ GetTestNumErrs() -- Retrieve the number of testing errors ***************************************************************************/ - #ifdef OLD_HEADER_FILENAME #include <iostream.h> #else #include <iostream> #endif -#include <string> - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif - -#include "h5test.h" // C test header file -#include "H5Cpp.h" // C++ API header file +using std::cerr; +using std::endl; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif /* !H5_NO_NAMESPACE */ +#include <string> +#include "H5Cpp.h" // C++ API header file +using namespace H5; +#include "h5test.h" #include "h5cpputil.h" // C++ utilility header file int diff --git a/c++/test/tfile.cpp b/c++/test/tfile.cpp index 0eabfb9..dba0980 100644 --- a/c++/test/tfile.cpp +++ b/c++/test/tfile.cpp @@ -22,28 +22,20 @@ h5_fileaccess() -- in h5test.c, returns a file access template ***************************************************************************/ - #ifdef OLD_HEADER_FILENAME #include <iostream.h> #else #include <iostream> #endif -#include <string> - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif - -#include "H5Cpp.h" // C++ API header file +using std::cerr; +using std::endl; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif +#include <string> +#include "H5Cpp.h" // C++ API header file +using namespace H5; -#include "h5cpputil.h" // C++ utilility header file +#include "h5test.h" +#include "h5cpputil.h" // C++ utilility header file const hsize_t F1_USERBLOCK_SIZE = (hsize_t)0; const size_t F1_OFFSET_SIZE = sizeof(haddr_t); @@ -817,9 +809,7 @@ static void test_commonfg() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void test_file() { // Output message about test being performed diff --git a/c++/test/tfilter.cpp b/c++/test/tfilter.cpp index 19549b3..ee78fe1 100644 --- a/c++/test/tfilter.cpp +++ b/c++/test/tfilter.cpp @@ -18,27 +18,19 @@ tfilter.cpp - HDF5 C++ testing various filters and their combination. ***************************************************************************/ - #ifdef OLD_HEADER_FILENAME #include <iostream.h> #else #include <iostream> #endif -#include <string> - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cerr; +using std::endl; +#include <string> #include "H5Cpp.h" // C++ API header file +using namespace H5; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif - +#include "h5test.h" #include "h5cpputil.h" // C++ utilility header file #define DSET_DIM1 100 @@ -258,9 +250,7 @@ static void test_szip_filter(H5File& file1) ** ****************************************************************/ const H5std_string FILE1("tfilters.h5"); -#ifdef __cplusplus extern "C" -#endif void test_filters() { // Output message about test being performed @@ -300,9 +290,7 @@ void test_filters() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void cleanup_filters() { HDremove(FILE1.c_str()); diff --git a/c++/test/th5s.cpp b/c++/test/th5s.cpp index 7ef048b..c795c08 100644 --- a/c++/test/th5s.cpp +++ b/c++/test/th5s.cpp @@ -21,28 +21,20 @@ EXTERNAL ROUTINES/VARIABLES: ***************************************************************************/ - #ifdef OLD_HEADER_FILENAME #include <iostream.h> #else #include <iostream> #endif -#include <string> - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif - -#include "H5Cpp.h" // C++ API header file +using std::cerr; +using std::endl; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif +#include <string> +#include "H5Cpp.h" // C++ API header file +using namespace H5; -#include "h5cpputil.h" // C++ utilility header file +#include "h5test.h" +#include "h5cpputil.h" // C++ utilility header file #include "H5srcdir.h" // srcdir querying header file const H5std_string TESTFILE("th5s.h5"); @@ -566,9 +558,7 @@ static void test_h5s_compound_scalar_read() * Modifications: *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void test_h5s() { // Output message about test being performed @@ -597,9 +587,7 @@ void test_h5s() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void cleanup_h5s() { HDremove(DATAFILE.c_str()); diff --git a/c++/test/titerate.cpp b/c++/test/titerate.cpp index e4aee97..7ee2b53 100644 --- a/c++/test/titerate.cpp +++ b/c++/test/titerate.cpp @@ -18,27 +18,19 @@ titerate.cpp - HDF5 C++ testing iterate related functionality ***************************************************************************/ - #ifdef OLD_HEADER_FILENAME #include <iostream.h> #else #include <iostream> #endif -#include <string> - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cerr; +using std::endl; +#include <string> #include "H5Cpp.h" // C++ API header file +using namespace H5; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif - +#include "h5test.h" #include "h5cpputil.h" // C++ utilility header file /* Number of datasets for group iteration test */ @@ -501,9 +493,7 @@ static void test_HDFFV_9920() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void test_iterate() { // Output message about test being performed @@ -532,9 +522,7 @@ void test_iterate() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void cleanup_iterate() { HDremove(FILE_ITERATE.c_str()); diff --git a/c++/test/tlinks.cpp b/c++/test/tlinks.cpp index a3eb690..1f7d14e 100644 --- a/c++/test/tlinks.cpp +++ b/c++/test/tlinks.cpp @@ -18,28 +18,20 @@ C link interface (H5L) ***************************************************************************/ - #ifdef OLD_HEADER_FILENAME #include <iostream.h> #else #include <iostream> #endif -#include <string> - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cerr; +using std::endl; +#include <string> #include "H5Cpp.h" // C++ API header file +using namespace H5; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif - -#include "h5cpputil.h" // C++ test utilility header file +#include "h5test.h" +#include "h5cpputil.h" // C++ utilility header file // A lot of the definition inherited from C test links.c is left here until // the H5L API is implemented and tests are completed - BMR 10/19/2009 @@ -460,9 +452,7 @@ static void test_basic_links(hid_t fapl_id, hbool_t new_format) * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void test_links() { hid_t fapl_id, fapl2_id; /* File access property lists */ @@ -651,9 +641,7 @@ void test_links() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void cleanup_links() { HDremove(FILENAME[0]); diff --git a/c++/test/tobject.cpp b/c++/test/tobject.cpp index 046e67a..b8654c3 100644 --- a/c++/test/tobject.cpp +++ b/c++/test/tobject.cpp @@ -18,27 +18,19 @@ tobject.cpp - HDF5 C++ testing object related functionality ***************************************************************************/ - #ifdef OLD_HEADER_FILENAME #include <iostream.h> #else #include <iostream> #endif -#include <string> - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cerr; +using std::endl; +#include <string> #include "H5Cpp.h" // C++ API header file +using namespace H5; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif - +#include "h5test.h" #include "h5cpputil.h" // C++ utilility header file const H5std_string FILE_OBJECTS("tobjects.h5"); @@ -319,9 +311,7 @@ static void test_get_objtype() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void test_object() { // Output message about test being performed @@ -346,9 +336,7 @@ void test_object() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void cleanup_object() { HDremove(FILE_OBJECTS.c_str()); diff --git a/c++/test/trefer.cpp b/c++/test/trefer.cpp index 1974541..9bc2eb0 100644 --- a/c++/test/trefer.cpp +++ b/c++/test/trefer.cpp @@ -19,20 +19,19 @@ Reference interface (H5R) ***************************************************************************/ - #ifdef OLD_HEADER_FILENAME #include <iostream.h> #else #include <iostream> #endif -#include <string> +using std::cerr; +using std::endl; +#include <string> #include "H5Cpp.h" // C++ API header file +using namespace H5; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif - +#include "h5test.h" #include "h5cpputil.h" // C++ utilility header file const H5std_string FILE1("trefer1.h5"); @@ -808,9 +807,7 @@ static void test_reference_compat(void) ** test_reference(): Main reference testing routine. ** ****************************************************************/ -#ifdef __cplusplus extern "C" -#endif void test_reference(void) { // Output message about test being performed @@ -830,9 +827,7 @@ void test_reference(void) ** Purpose: Cleanup temporary test files ** Return: none ****************************************************************/ -#ifdef __cplusplus extern "C" -#endif void cleanup_reference(void) { HDremove(FILE1.c_str()); diff --git a/c++/test/ttypes.cpp b/c++/test/ttypes.cpp index c65d6a5..1ef7bdd 100644 --- a/c++/test/ttypes.cpp +++ b/c++/test/ttypes.cpp @@ -18,27 +18,19 @@ ttypes.cpp - HDF5 C++ testing the general datatype functionality ***************************************************************************/ - #ifdef OLD_HEADER_FILENAME #include <iostream.h> #else #include <iostream> #endif -#include <string> - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cerr; +using std::endl; +#include <string> #include "H5Cpp.h" // C++ API header file +using namespace H5; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif - +#include "h5test.h" #include "h5cpputil.h" // C++ utilility header file /* @@ -549,9 +541,7 @@ static void test_named () ** test_types(): Main datatypes testing routine. ** ****************************************************************/ -#ifdef __cplusplus extern "C" -#endif void test_types() { // Output message about test being performed @@ -581,9 +571,7 @@ void test_types() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void cleanup_types() { for (int i = 0; i < 3; i++) diff --git a/c++/test/tvlstr.cpp b/c++/test/tvlstr.cpp index 6ec7f25..d39d092 100644 --- a/c++/test/tvlstr.cpp +++ b/c++/test/tvlstr.cpp @@ -20,27 +20,19 @@ EXTERNAL ROUTINES/VARIABLES: ***************************************************************************/ - #ifdef OLD_HEADER_FILENAME #include <iostream.h> #else #include <iostream> #endif -#include <string> - -#ifndef H5_NO_NAMESPACE -#ifndef H5_NO_STD - using std::cerr; - using std::endl; -#endif // H5_NO_STD -#endif +using std::cerr; +using std::endl; +#include <string> #include "H5Cpp.h" // C++ API header file +using namespace H5; -#ifndef H5_NO_NAMESPACE - using namespace H5; -#endif - +#include "h5test.h" #include "h5cpputil.h" // C++ utilility header file // Data file used in most test functions @@ -958,9 +950,7 @@ static void test_vl_rewrite() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void test_vlstrings() { // Output message about test being performed @@ -1000,9 +990,7 @@ void test_vlstrings() * *------------------------------------------------------------------------- */ -#ifdef __cplusplus extern "C" -#endif void cleanup_vlstrings() { HDremove(FILENAME.c_str()); |