From 6c7b494f8d1203fb34e01e349b339a70a68daa7a Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Thu, 2 Jul 2020 12:01:56 +0200 Subject: [PATCH] [sonar] Declare functions "const" in src/xbt/. --- include/xbt/file.hpp | 4 ++-- include/xbt/random.hpp | 2 +- src/xbt/config.cpp | 12 ++++++------ src/xbt/random.cpp | 2 +- src/xbt/xbt_os_file.cpp | 4 ++-- 5 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/xbt/file.hpp b/include/xbt/file.hpp index e98178f7f8..b12800f8a8 100644 --- a/include/xbt/file.hpp +++ b/include/xbt/file.hpp @@ -24,9 +24,9 @@ public: /** @brief Returns the full path name */ const std::string& get_name() const { return path_; } /** @brief Returns the directory component of a path (reimplementation of POSIX dirname) */ - std::string get_dir_name(); + std::string get_dir_name() const; /** @brief Returns the file component of a path (reimplementation of POSIX basename) */ - std::string get_base_name(); + std::string get_base_name() const; private: std::string path_; diff --git a/include/xbt/random.hpp b/include/xbt/random.hpp index d4c612f653..7d4e4ef30b 100644 --- a/include/xbt/random.hpp +++ b/include/xbt/random.hpp @@ -45,7 +45,7 @@ public: /** * @brief Write the state of the Mersenne-Twister RNG to a file */ - bool write_state(const std::string& filename); + bool write_state(const std::string& filename) const; /** * @brief Draws an integer number uniformly in range [min, max] (min and max included) diff --git a/src/xbt/config.cpp b/src/xbt/config.cpp index e3b4f9a385..5a9cb8d74a 100644 --- a/src/xbt/config.cpp +++ b/src/xbt/config.cpp @@ -269,9 +269,9 @@ public: } // Debug: - void dump(const char *name, const char *indent); - void show_aliases(); - void help(); + void dump(const char* name, const char* indent) const; + void show_aliases() const; + void help() const; protected: ConfigurationElement* get_dict_element(const std::string& name); @@ -321,7 +321,7 @@ void Config::alias(const std::string& realname, const std::string& aliasname) * @param name The name to give to this config set * @param indent what to write at the beginning of each line (right number of spaces) */ -void Config::dump(const char *name, const char *indent) +void Config::dump(const char* name, const char* indent) const { if (name) XBT_CVERB(xbt_help, "%s>> Dumping of the config set '%s':", indent, name); @@ -335,14 +335,14 @@ void Config::dump(const char *name, const char *indent) } /** @brief Displays the declared aliases and their replacement */ -void Config::show_aliases() +void Config::show_aliases() const { for (auto const& elm : aliases) XBT_HELP(" %-40s %s", elm.first.c_str(), elm.second->get_key().c_str()); } /** @brief Displays the declared options and their description */ -void Config::help() +void Config::help() const { for (auto const& elm : options) { simgrid::config::ConfigurationElement* variable = elm.second.get(); diff --git a/src/xbt/random.cpp b/src/xbt/random.cpp index 8439deaff3..9a0ef47f7d 100644 --- a/src/xbt/random.cpp +++ b/src/xbt/random.cpp @@ -29,7 +29,7 @@ bool Random::read_state(const std::string& filename) return not file.fail(); } -bool Random::write_state(const std::string& filename) +bool Random::write_state(const std::string& filename) const { std::ofstream file(filename); file << mt19937_gen; diff --git a/src/xbt/xbt_os_file.cpp b/src/xbt/xbt_os_file.cpp index e28fe03b8f..713009edb6 100644 --- a/src/xbt/xbt_os_file.cpp +++ b/src/xbt/xbt_os_file.cpp @@ -33,14 +33,14 @@ simgrid::xbt::Path::Path() #endif } -std::string simgrid::xbt::Path::get_dir_name() +std::string simgrid::xbt::Path::get_dir_name() const { std::string p(path_); const char* res = dirname(&p[0]); return std::string(res, strlen(res)); } -std::string simgrid::xbt::Path::get_base_name() +std::string simgrid::xbt::Path::get_base_name() const { std::string p(path_); const char* res = basename(&p[0]); -- 2.20.1