X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b8df87e176f27b25534f27d7e240defa32ca35bc..4c427bd273d7f90bbe5233b6fe8d20bfd945ea4b:/include/xbt/config.hpp diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp index ebcdd6512f..a0406db96d 100644 --- a/include/xbt/config.hpp +++ b/include/xbt/config.hpp @@ -65,16 +65,16 @@ extern template XBT_PUBLIC void set_value(const char* name, bool value); extern template XBT_PUBLIC void set_value(const char* name, std::string value); XBT_PUBLIC void set_as_string(const char* name, const std::string& value); -XBT_PUBLIC void set_parse(std::string options); +XBT_PUBLIC void set_parse(const std::string& options); // Get config -template XBT_PUBLIC T const& get_value(std::string name); +template XBT_PUBLIC T const& get_value(const std::string& name); -extern template XBT_PUBLIC int const& get_value(std::string name); -extern template XBT_PUBLIC double const& get_value(std::string name); -extern template XBT_PUBLIC bool const& get_value(std::string name); -extern template XBT_PUBLIC std::string const& get_value(std::string name); +extern template XBT_PUBLIC int const& get_value(const std::string& name); +extern template XBT_PUBLIC double const& get_value(const std::string& name); +extern template XBT_PUBLIC bool const& get_value(const std::string& name); +extern template XBT_PUBLIC std::string const& get_value(const std::string& name); // Register: @@ -86,16 +86,16 @@ extern template XBT_PUBLIC std::string const& get_value(std::string * @param callback called with the option value */ template -XBT_PUBLIC void declare_flag(std::string name, std::string description, T value, +XBT_PUBLIC void declare_flag(const std::string& name, const std::string& description, T value, std::function callback = std::function()); -extern template XBT_PUBLIC void declare_flag(std::string name, std::string description, int value, +extern template XBT_PUBLIC void declare_flag(const std::string& name, const std::string& description, int value, std::function callback); -extern template XBT_PUBLIC void declare_flag(std::string name, std::string description, double value, +extern template XBT_PUBLIC void declare_flag(const std::string& name, const std::string& description, double value, std::function callback); -extern template XBT_PUBLIC void declare_flag(std::string name, std::string description, bool value, +extern template XBT_PUBLIC void declare_flag(const std::string& name, const std::string& description, bool value, std::function callback); -extern template XBT_PUBLIC void declare_flag(std::string name, std::string description, std::string value, +extern template XBT_PUBLIC void declare_flag(const std::string& name, const std::string& description, std::string value, std::function callback); // ***** alias ***** @@ -278,7 +278,7 @@ public: T& get() { return value_; } T const& get() const { return value_; } - std::string get_name() const { return name_; } + const std::string& get_name() const { return name_; } // Implicit conversion to the underlying type: operator T&() { return value_; } operator T const&() const{ return value_; } @@ -307,7 +307,5 @@ XBT_PUBLIC void show_aliases(); XBT_PUBLIC void help(); } } -XBT_ATTRIB_DEPRECATED_v323("Please use simgrid::config::get_value") XBT_PUBLIC std::string - xbt_cfg_get_string(const char* name); #endif