diff options
| author | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-30 20:03:37 (GMT) |
|---|---|---|
| committer | Quincey Koziol <koziol@hdfgroup.org> | 2007-08-30 20:03:37 (GMT) |
| commit | a4069db8f48121ca11d0465b260d9cd81152581b (patch) | |
| tree | 37348ad7d71058a6f449255073d631db8c33794a /c++/src | |
| parent | 1374654210854d005546459e48c482c5ea01cba2 (diff) | |
| download | hdf5-a4069db8f48121ca11d0465b260d9cd81152581b.zip hdf5-a4069db8f48121ca11d0465b260d9cd81152581b.tar.gz hdf5-a4069db8f48121ca11d0465b260d9cd81152581b.tar.bz2 | |
[svn-r14131] Description:
Move H5Giterate() and H5G_iterate_t to deprecated symbols section,
replacing them with H5Literate and H5L_iterate_t respectively.
Tested on:
FreeBSD/32 6.2 (duty)
FreeBSD/64 6.2 (liberty)
Linux/32 2.6 (kagiso)
Linux/64 2.6 (smirom)
AIX/32 5.3 (copper)
Solaris/32 5.10 (linew)
Mac OS X/32 10.4.10 (amazon)
Diffstat (limited to 'c++/src')
| -rw-r--r-- | c++/src/H5CommonFG.cpp | 6 | ||||
| -rw-r--r-- | c++/src/H5CommonFG.h | 6 |
2 files changed, 8 insertions, 4 deletions
diff --git a/c++/src/H5CommonFG.cpp b/c++/src/H5CommonFG.cpp index 251131d..7b8c5ac 100644 --- a/c++/src/H5CommonFG.cpp +++ b/c++/src/H5CommonFG.cpp @@ -243,7 +243,7 @@ DataSet CommonFG::openDataSet( const H5std_string& name ) const /// specified location. // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -void CommonFG::link( H5G_link_t link_type, const char* curr_name, const char* new_name ) const +void CommonFG::link( H5L_type_t link_type, const char* curr_name, const char* new_name ) const { herr_t ret_value; @@ -274,7 +274,7 @@ void CommonFG::link( H5G_link_t link_type, const char* curr_name, const char* ne /// \c std::string for \a curr_name and \a new_name. // Programmer Binh-Minh Ribler - 2000 //-------------------------------------------------------------------------- -void CommonFG::link( H5G_link_t link_type, const H5std_string& curr_name, const H5std_string& new_name ) const +void CommonFG::link( H5L_type_t link_type, const H5std_string& curr_name, const H5std_string& new_name ) const { link( link_type, curr_name.c_str(), new_name.c_str() ); } @@ -935,6 +935,7 @@ VarLenType CommonFG::openVarLenType( const H5std_string& name ) const return( openVarLenType( name.c_str()) ); } +#ifndef H5_NO_DEPRECATED_SYMBOLS //-------------------------------------------------------------------------- // Function: CommonFG::iterateElems ///\brief Iterates a user's function over the entries of a group. @@ -969,6 +970,7 @@ int CommonFG::iterateElems( const H5std_string& name, int *idx, H5G_iterate_t op { return( iterateElems( name.c_str(), idx, op, op_data )); } +#endif /* H5_NO_DEPRECATED_SYMBOLS */ //-------------------------------------------------------------------------- // Function: CommonFG::getNumObjs diff --git a/c++/src/H5CommonFG.h b/c++/src/H5CommonFG.h index 5c75989..ed1c132 100644 --- a/c++/src/H5CommonFG.h +++ b/c++/src/H5CommonFG.h @@ -86,15 +86,17 @@ class H5_DLLCPP CommonFG { H5G_obj_t getObjTypeByIdx(hsize_t idx) const; H5G_obj_t getObjTypeByIdx(hsize_t idx, H5std_string& type_name) const; +#ifndef H5_NO_DEPRECATED_SYMBOLS // Iterates over the elements of this group - not implemented in // C++ style yet. int iterateElems(const char* name, int *idx, H5G_iterate_t op, void *op_data); int iterateElems(const H5std_string& name, int *idx, H5G_iterate_t op, void *op_data); +#endif /* H5_NO_DEPRECATED_SYMBOLS */ // Creates a link of the specified type from new_name to current_name; // both names are interpreted relative to the specified location id. - void link(H5G_link_t link_type, const char* curr_name, const char* new_name) const; - void link(H5G_link_t link_type, const H5std_string& curr_name, const H5std_string& new_name) const; + void link(H5L_type_t link_type, const char* curr_name, const char* new_name) const; + void link(H5L_type_t link_type, const H5std_string& curr_name, const H5std_string& new_name) const; // Removes the specified name at this location. void unlink(const char* name) const; |