From a741dd6ddb10cc3acfe8ec5916ea01f52b2cdda0 Mon Sep 17 00:00:00 2001 From: Greg Sjaardema Date: Wed, 10 Apr 2024 11:26:33 -0600 Subject: [PATCH] IOSS: Clang-tidy suggestions --- .../libraries/ioss/src/Ioss_CoordinateFrame.h | 2 +- .../libraries/ioss/src/Ioss_ElementTopology.h | 9 +++--- .../libraries/ioss/src/Ioss_FaceBlock.h | 2 -- .../libraries/ioss/src/Ioss_FieldManager.h | 2 +- .../libraries/ioss/src/Ioss_GetLongOpt.C | 12 +++----- .../libraries/ioss/src/Ioss_GetLongOpt.h | 6 ++-- .../libraries/ioss/src/Ioss_NullEntity.C | 1 + .../seacas/libraries/ioss/src/Ioss_Property.h | 2 +- .../libraries/ioss/src/Ioss_PropertyManager.C | 1 - .../seacas/libraries/ioss/src/Ioss_Utils.h | 29 +++++++++---------- .../libraries/ioss/src/Ioss_VariableType.h | 8 +++-- .../ioss/src/cgns/Iocgns_StructuredZoneData.C | 4 +-- 12 files changed, 35 insertions(+), 43 deletions(-) diff --git a/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.h b/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.h index 46795e00b9..ba434eccd9 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.h +++ b/packages/seacas/libraries/ioss/src/Ioss_CoordinateFrame.h @@ -32,7 +32,7 @@ namespace Ioss { IOSS_NODISCARD bool equal(const Ioss::CoordinateFrame &rhs) const; private: - bool equal_(const Ioss::CoordinateFrame &rhs, bool quiet) const; + IOSS_NODISCARD bool equal_(const Ioss::CoordinateFrame &rhs, bool quiet) const; std::vector pointList_{}; int64_t id_{}; char tag_; diff --git a/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h b/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h index d36f62b54f..7271122eb3 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h +++ b/packages/seacas/libraries/ioss/src/Ioss_ElementTopology.h @@ -52,7 +52,6 @@ namespace Ioss { } ~ETRegistry(); - std::map customFieldTypes; private: Ioss::ElementTopologyMap m_registry; @@ -147,12 +146,12 @@ namespace Ioss { protected: ElementTopology(std::string type, std::string master_elem_name, bool delete_me = false); - virtual bool validate_permutation_nodes() const { return true; } + IOSS_NODISCARD virtual bool validate_permutation_nodes() const { return true; } private: - bool equal_(const Ioss::ElementTopology &rhs, bool quiet) const; - const std::string name_; - const std::string masterElementName_; + IOSS_NODISCARD bool equal_(const Ioss::ElementTopology &rhs, bool quiet) const; + const std::string name_; + const std::string masterElementName_; static const std::string &topology_shape_to_permutation_name(Ioss::ElementShape topoShape); diff --git a/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.h b/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.h index f74656e8b6..f000f6af7a 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.h +++ b/packages/seacas/libraries/ioss/src/Ioss_FaceBlock.h @@ -31,8 +31,6 @@ namespace Ioss { FaceBlock(DatabaseIO *io_database, const std::string &my_name, const std::string &face_type, int64_t number_faces); - FaceBlock(const FaceBlock &) = default; - IOSS_NODISCARD std::string type_string() const override { return "FaceBlock"; } IOSS_NODISCARD std::string short_type_string() const override { return "faceblock"; } IOSS_NODISCARD std::string contains_string() const override { return "Face"; } diff --git a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h index 450d5531fa..e0497a5cf5 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h +++ b/packages/seacas/libraries/ioss/src/Ioss_FieldManager.h @@ -52,7 +52,7 @@ namespace Ioss { void erase(const std::string &field_name); // Checks if a field with 'field_name' exists in the database. - bool exists(const std::string &field_name) const; + IOSS_NODISCARD bool exists(const std::string &field_name) const; IOSS_NODISCARD Field get(const std::string &field_name) const; IOSS_NODISCARD const Field &getref(const std::string &field_name) const; diff --git a/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C b/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C index 74e98ed1df..011d483fef 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C +++ b/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.C @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2021, 2023 National Technology & Engineering Solutions +// Copyright(C) 1999-2021, 2023, 2024 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -6,22 +6,19 @@ /* S Manoharan. Advanced Computer Research Institute. Lyon. France */ #include "Ioss_GetLongOpt.h" +#include #include #include #include #include #include -#include namespace Ioss { /** \brief Create an empty options database. * * \param optmark The command line symbol designating options. */ - GetLongOption::GetLongOption(const char optmark) : optmarker(optmark) - { - ustring = "[valid options and arguments]"; - } + GetLongOption::GetLongOption(const char optmark) : optmarker(optmark) {} /** \brief Frees dynamically allocated memory. * @@ -108,8 +105,7 @@ namespace Ioss { */ const char *GetLongOption::retrieve(const char *const opt) const { - Cell *t; - for (t = table; t != nullptr; t = t->next) { + for (Cell *t = table; t != nullptr; t = t->next) { if (strcmp(opt, t->option) == 0) { return t->value; } diff --git a/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.h b/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.h index b43a539ce7..d76d8723c5 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.h +++ b/packages/seacas/libraries/ioss/src/Ioss_GetLongOpt.h @@ -1,5 +1,5 @@ /* - * Copyright(C) 1999-2023 National Technology & Engineering Solutions + * Copyright(C) 1999-2024 National Technology & Engineering Solutions * of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with * NTESS, the U.S. Government retains certain rights in this software. * @@ -41,8 +41,8 @@ namespace Ioss { Cell() = default; }; - Cell *table{nullptr}; // option table - const char *ustring{nullptr}; // usage message + Cell *table{nullptr}; // option table + const char *ustring{"[valid options and arguments]"}; char *pname{nullptr}; // program basename Cell *last{nullptr}; // last entry in option table char optmarker; // option marker diff --git a/packages/seacas/libraries/ioss/src/Ioss_NullEntity.C b/packages/seacas/libraries/ioss/src/Ioss_NullEntity.C index f05c1d35f6..0a0d64b5e6 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_NullEntity.C +++ b/packages/seacas/libraries/ioss/src/Ioss_NullEntity.C @@ -4,6 +4,7 @@ // // See packages/seacas/LICENSE for details +#include "Ioss_GroupingEntity.h" #include "Ioss_NullEntity.h" namespace Ioss { diff --git a/packages/seacas/libraries/ioss/src/Ioss_Property.h b/packages/seacas/libraries/ioss/src/Ioss_Property.h index 290405405c..2ef5656778 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Property.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Property.h @@ -97,7 +97,7 @@ namespace Ioss { IOSS_NODISCARD bool operator!=(const Ioss::Property &rhs) const; IOSS_NODISCARD bool operator==(const Ioss::Property &rhs) const; - friend void swap(Ioss::Property &first, Ioss::Property &second) // nothrow + friend void swap(Ioss::Property &first, Ioss::Property &second) noexcept { using std::swap; swap(first.name_, second.name_); diff --git a/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C b/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C index 239d75a61b..31add46758 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C +++ b/packages/seacas/libraries/ioss/src/Ioss_PropertyManager.C @@ -9,7 +9,6 @@ #include "Ioss_Utils.h" #include #include -#include #include #include "Ioss_CodeTypes.h" diff --git a/packages/seacas/libraries/ioss/src/Ioss_Utils.h b/packages/seacas/libraries/ioss/src/Ioss_Utils.h index 670eed3af7..e0479488ec 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_Utils.h +++ b/packages/seacas/libraries/ioss/src/Ioss_Utils.h @@ -58,9 +58,7 @@ template IOSS_NODISCARD constexpr T *Data(std::vector &vec) if (vec.empty()) { return nullptr; } - else { - return vec.data(); - } + return vec.data(); } template IOSS_NODISCARD constexpr const T *Data(const std::vector &vec) @@ -68,9 +66,7 @@ template IOSS_NODISCARD constexpr const T *Data(const std::vector IOSS_NODISCARD constexpr T *Data(std::array &arr) @@ -88,18 +84,17 @@ namespace Ioss { */ class IOSS_EXPORT Utils { - public: - /** - * \defgroup IossStreams Streams used for IOSS output - *@{ - */ static std::ostream *m_outputStream; ///< general informational output (very rare). Default std::cerr static std::ostream *m_debugStream; ///< debug output when requested. Default std::cerr static std::ostream *m_warningStream; ///< IOSS warning output. Default std::cerr static std::string m_preWarningText; ///< is a string that prepends all warning message output. ///< Default is "\nIOSS WARNING: " - + public: + /** + * \defgroup IossStreams Streams used for IOSS output + *@{ + */ /** \brief set the stream for all streams (output, debug, and warning) to the specified * `out_stream` */ @@ -117,6 +112,8 @@ namespace Ioss { */ IOSS_NODISCARD static std::ostream &get_output_stream(); + IOSS_NODISCARD static std::string &get_warning_text() { return m_preWarningText; } + /** \brief set the output stream to the specified `output_stream` */ static void set_output_stream(std::ostream &output_stream); @@ -608,16 +605,16 @@ namespace Ioss { } }; - inline std::ostream &OUTPUT() { return *Utils::m_outputStream; } + inline std::ostream &OUTPUT() { return Utils::get_output_stream(); } - inline std::ostream &DebugOut() { return *Utils::m_debugStream; } + inline std::ostream &DebugOut() { return Utils::get_debug_stream(); } inline std::ostream &WarnOut(bool output_prewarning = true) { if (output_prewarning) { - *Utils::m_warningStream << Utils::m_preWarningText; + Utils::get_warning_stream() << Utils::get_warning_text(); } - return *Utils::m_warningStream; + return Utils::get_warning_stream(); } } // namespace Ioss diff --git a/packages/seacas/libraries/ioss/src/Ioss_VariableType.h b/packages/seacas/libraries/ioss/src/Ioss_VariableType.h index e88430dae4..4d7efaf43e 100644 --- a/packages/seacas/libraries/ioss/src/Ioss_VariableType.h +++ b/packages/seacas/libraries/ioss/src/Ioss_VariableType.h @@ -26,6 +26,8 @@ namespace Ioss { class IOSS_EXPORT Registry { + friend class VariableType; + public: void insert(const Ioss::VTM_ValuePair &value, bool delete_me); IOSS_NODISCARD VariableTypeMap::iterator begin() { return m_registry.begin(); } @@ -36,11 +38,11 @@ namespace Ioss { } ~Registry(); - std::map customFieldTypes; private: - Ioss::VariableTypeMap m_registry; - std::vector m_deleteThese; + std::map customFieldTypes; + Ioss::VariableTypeMap m_registry; + std::vector m_deleteThese; }; struct IOSS_EXPORT Suffix diff --git a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C index 98def353b2..da349a3b61 100644 --- a/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C +++ b/packages/seacas/libraries/ioss/src/cgns/Iocgns_StructuredZoneData.C @@ -1,4 +1,4 @@ -// Copyright(C) 1999-2023 National Technology & Engineering Solutions +// Copyright(C) 1999-2024 National Technology & Engineering Solutions // of Sandia, LLC (NTESS). Under the terms of Contract DE-NA0003525 with // NTESS, the U.S. Government retains certain rights in this software. // @@ -8,9 +8,9 @@ #include "Ioss_SmartAssert.h" #include "cgns/Iocgns_StructuredZoneData.h" #include +#include #include #include -#include #if !defined __NVCC__ #include #endif