A
lgorithmique
N
umérique
D
istribuée
Public GIT Repository
projects
/
simgrid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into CRTP
[simgrid.git]
/
include
/
xbt
/
config.hpp
diff --git
a/include/xbt/config.hpp
b/include/xbt/config.hpp
index
2e13f11
..
a0406db
100644
(file)
--- a/
include/xbt/config.hpp
+++ b/
include/xbt/config.hpp
@@
-1,4
+1,4
@@
-/* Copyright (c) 2016-201
8
. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2016-201
9
. 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. */
/* 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. */
@@
-65,16
+65,16
@@
extern template XBT_PUBLIC void set_value<bool>(const char* name, bool value);
extern template XBT_PUBLIC void set_value<std::string>(const char* name, std::string value);
XBT_PUBLIC void set_as_string(const char* name, const std::string& value);
extern template XBT_PUBLIC void set_value<std::string>(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
// Get config
-template <class T> XBT_PUBLIC T const& get_value(
std::string
name);
+template <class T> XBT_PUBLIC T const& get_value(
const std::string&
name);
-extern template XBT_PUBLIC int const& get_value<int>(
std::string
name);
-extern template XBT_PUBLIC double const& get_value<double>(
std::string
name);
-extern template XBT_PUBLIC bool const& get_value<bool>(
std::string
name);
-extern template XBT_PUBLIC std::string const& get_value<std::string>(
std::string
name);
+extern template XBT_PUBLIC int const& get_value<int>(
const std::string&
name);
+extern template XBT_PUBLIC double const& get_value<double>(
const std::string&
name);
+extern template XBT_PUBLIC bool const& get_value<bool>(
const std::string&
name);
+extern template XBT_PUBLIC std::string const& get_value<std::string>(
const std::string&
name);
// Register:
// Register:
@@
-86,16
+86,16
@@
extern template XBT_PUBLIC std::string const& get_value<std::string>(std::string
* @param callback called with the option value
*/
template <class T>
* @param callback called with the option value
*/
template <class T>
-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<void(const T&)> callback = std::function<void(const T&)>());
std::function<void(const T&)> callback = std::function<void(const T&)>());
-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<void(int const&)> callback);
std::function<void(int const&)> 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<void(double const&)> callback);
std::function<void(double const&)> 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<void(bool const&)> callback);
std::function<void(bool const&)> 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<void(std::string const&)> callback);
// ***** alias *****
std::function<void(std::string const&)> callback);
// ***** alias *****
@@
-214,6
+214,8
@@
bind_flag(T& value, const char* name, const char* description, F callback)
template<class T>
class Flag {
T value_;
template<class T>
class Flag {
T value_;
+ std::string name_;
+
public:
/** Constructor
public:
/** Constructor
@@
-222,13
+224,14
@@
public:
* @param desc Flag description
* @param value Flag initial/default value
*/
* @param desc Flag description
* @param value Flag initial/default value
*/
- Flag(const char* name, const char* desc, T value) : value_(value)
+ Flag(const char* name, const char* desc, T value) : value_(value)
, name_(name)
{
simgrid::config::bind_flag(value_, name, desc);
}
/** Constructor taking also an array of aliases for name */
{
simgrid::config::bind_flag(value_, name, desc);
}
/** Constructor taking also an array of aliases for name */
- Flag(const char* name, std::initializer_list<const char*> aliases, const char* desc, T value) : value_(value)
+ Flag(const char* name, std::initializer_list<const char*> aliases, const char* desc, T value)
+ : value_(value), name_(name)
{
simgrid::config::bind_flag(value_, name, std::move(aliases), desc);
}
{
simgrid::config::bind_flag(value_, name, std::move(aliases), desc);
}
@@
-236,15
+239,14
@@
public:
/* A constructor accepting a callback that will be passed the parameter.
* It can either return a boolean (informing whether the parameter is valid), or returning void.
*/
/* A constructor accepting a callback that will be passed the parameter.
* It can either return a boolean (informing whether the parameter is valid), or returning void.
*/
- template<class F>
- Flag(const char* name, const char* desc, T value, F callback) : value_(value)
+ template <class F> Flag(const char* name, const char* desc, T value, F callback) : value_(value), name_(name)
{
simgrid::config::bind_flag(value_, name, desc, std::move(callback));
}
template <class F>
Flag(const char* name, std::initializer_list<const char*> aliases, const char* desc, T value, F callback)
{
simgrid::config::bind_flag(value_, name, desc, std::move(callback));
}
template <class F>
Flag(const char* name, std::initializer_list<const char*> aliases, const char* desc, T value, F callback)
- : value_(value)
+ : value_(value)
, name_(name)
{
simgrid::config::bind_flag(value_, name, std::move(aliases), desc, std::move(callback));
}
{
simgrid::config::bind_flag(value_, name, std::move(aliases), desc, std::move(callback));
}
@@
-253,7
+255,8
@@
public:
* and producing an informative error message when an invalid value is passed, or when help is passed as a value.
*/
template <class F>
* and producing an informative error message when an invalid value is passed, or when help is passed as a value.
*/
template <class F>
- Flag(const char* name, const char* desc, T value, std::map<T, std::string> valid_values, F callback) : value_(value)
+ Flag(const char* name, const char* desc, T value, std::map<T, std::string> valid_values, F callback)
+ : value_(value), name_(name)
{
simgrid::config::bind_flag(value_, name, desc, std::move(valid_values), std::move(callback));
}
{
simgrid::config::bind_flag(value_, name, desc, std::move(valid_values), std::move(callback));
}
@@
-262,7
+265,7
@@
public:
template <class F>
Flag(const char* name, std::initializer_list<const char*> aliases, const char* desc, T value,
std::map<T, std::string> valid_values, F callback)
template <class F>
Flag(const char* name, std::initializer_list<const char*> aliases, const char* desc, T value,
std::map<T, std::string> valid_values, F callback)
- : value_(value)
+ : value_(value)
, name_(name)
{
simgrid::config::bind_flag(value_, name, std::move(aliases), desc, std::move(valid_values), std::move(callback));
}
{
simgrid::config::bind_flag(value_, name, std::move(aliases), desc, std::move(valid_values), std::move(callback));
}
@@
-275,6
+278,7
@@
public:
T& get() { return value_; }
T const& get() const { return value_; }
T& get() { return value_; }
T const& get() const { return value_; }
+ const std::string& get_name() const { return name_; }
// Implicit conversion to the underlying type:
operator T&() { return value_; }
operator T const&() const{ return value_; }
// Implicit conversion to the underlying type:
operator T&() { return value_; }
operator T const&() const{ return value_; }
@@
-303,7
+307,5
@@
XBT_PUBLIC void show_aliases();
XBT_PUBLIC void help();
}
}
XBT_PUBLIC void help();
}
}
-XBT_ATTRIB_DEPRECATED_v323("Please use simgrid::config::get_value<std::string>") XBT_PUBLIC std::string
- xbt_cfg_get_string(const char* name);
#endif
#endif