X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/29a3b2869c0075fc75e8ccc66fc1d9c4c8bf6a85..3d35f119d529a283de2a39bca8d8034e6086aefc:/include/xbt/config.hpp diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp index 270ee125f4..1a04a570f9 100644 --- a/include/xbt/config.hpp +++ b/include/xbt/config.hpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2016-2018. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2016-2019. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -41,7 +41,7 @@ inline std::string const& to_string(std::string const& value) } inline std::string to_string(std::string&& value) { - return std::move(value); + return value; } // Set default @@ -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_; }