diff options
| author | Sean McBride <sean@rogue-research.com> | 2021-02-25 18:15:02 (GMT) |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-25 18:15:02 (GMT) |
| commit | c29e1b9fdfcba9ca276600b1bad4ec2cf17bb01e (patch) | |
| tree | 59c16ade26ea62e2ffc89506e1a245b4f296b82e /c++/src/H5Object.cpp | |
| parent | c17b4b93d680340af2b3f2c026f2c03c3baeb33a (diff) | |
| download | hdf5-c29e1b9fdfcba9ca276600b1bad4ec2cf17bb01e.zip hdf5-c29e1b9fdfcba9ca276600b1bad4ec2cf17bb01e.tar.gz hdf5-c29e1b9fdfcba9ca276600b1bad4ec2cf17bb01e.tar.bz2 | |
Patches from vtk (#358)
* Drop the export attribute on forward declaration
They don't mean anything on forward declarations anyways.
* Fixed -Wunused-parameter warnings in some C++ files
Allowed all the attribute #defines to work in C++ also.
* Fixed -Wunused-variable warnings by removing dead code
* Fixed all -Wshorten-64-to-32 warnings by adjusting casts
There was no truncation in fact, since the unsigned result was upcast to size_t then implicitly downcast to uint32_t.
* Fixed all -Wcomma warnings by spliting statements onto own lines
* Fixed all -Wself-assign warnings with different unused param suppression
* Fixed all -Wextra-semi warnings
* Fixed all -Wswitch-enum warnings
Just added new explicit cases with the existing default case.
* Fixed all -Wmissing-prototypes warnings
Just made functions static. Moved them into an extern "C" block.
* Reformatted source with bin/format_source using clang version 10.0.1
Co-authored-by: Larry Knox <lrknox@hdfgroup.org>
Diffstat (limited to 'c++/src/H5Object.cpp')
| -rw-r--r-- | c++/src/H5Object.cpp | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/c++/src/H5Object.cpp b/c++/src/H5Object.cpp index 669bffc..725d1da 100644 --- a/c++/src/H5Object.cpp +++ b/c++/src/H5Object.cpp @@ -42,8 +42,11 @@ namespace H5 { #ifndef DOXYGEN_SHOULD_SKIP_THIS // userAttrOpWrpr interfaces between the user's function and the // C library function H5Aiterate2 -extern "C" herr_t -userAttrOpWrpr(hid_t loc_id, const char *attr_name, const H5A_info_t *ainfo, void *op_data) +extern "C" { + +static herr_t +userAttrOpWrpr(H5_ATTR_UNUSED hid_t loc_id, const char *attr_name, H5_ATTR_UNUSED const H5A_info_t *ainfo, + void *op_data) { H5std_string s_attr_name = H5std_string(attr_name); UserData4Aiterate *myData = reinterpret_cast<UserData4Aiterate *>(op_data); @@ -53,8 +56,9 @@ userAttrOpWrpr(hid_t loc_id, const char *attr_name, const H5A_info_t *ainfo, voi // userVisitOpWrpr interfaces between the user's function and the // C library function H5Ovisit3 -extern "C" herr_t -userVisitOpWrpr(hid_t obj_id, const char *attr_name, const H5O_info2_t *obj_info, void *op_data) +static herr_t +userVisitOpWrpr(H5_ATTR_UNUSED hid_t obj_id, const char *attr_name, const H5O_info2_t *obj_info, + void *op_data) { H5std_string s_attr_name = H5std_string(attr_name); UserData4Visit *myData = reinterpret_cast<UserData4Visit *>(op_data); @@ -62,6 +66,8 @@ userVisitOpWrpr(hid_t obj_id, const char *attr_name, const H5O_info2_t *obj_info return status; } +} // extern "C" + //-------------------------------------------------------------------------- // Function: H5Object default constructor (protected) // Programmer Binh-Minh Ribler - 2000 |