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' of github.com:simgrid/simgrid into s_type_cleanup
[simgrid.git]
/
include
/
xbt
/
config.hpp
diff --git
a/include/xbt/config.hpp
b/include/xbt/config.hpp
index
c9d4df5
..
f5b3c95
100644
(file)
--- a/
include/xbt/config.hpp
+++ b/
include/xbt/config.hpp
@@
-1,11
+1,10
@@
-/* Copyright (c) 2016. The SimGrid Team.
- * All rights reserved. */
+/* Copyright (c) 2016-2017. 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. */
-#ifndef
_XBT_CONFIG_HPP_
-#define
_XBT_CONFIG_HPP_
+#ifndef
XBT_CONFIG_HPP
+#define
XBT_CONFIG_HPP
#include <xbt/base.h>
#include <xbt/base.h>
@@
-30,7
+29,7
@@
public:
: std::runtime_error(what) {}
explicit missing_key_error(const char* what)
: std::runtime_error(what) {}
: std::runtime_error(what) {}
explicit missing_key_error(const char* what)
: std::runtime_error(what) {}
- ~missing_key_error()
noexcept
;
+ ~missing_key_error()
override
;
};
template<class T> inline
};
template<class T> inline
@@
-104,7
+103,6
@@
void alias(std::initializer_list<const char*> names)
template<class T>
void bindFlag(T& value, const char* name, const char* description)
{
template<class T>
void bindFlag(T& value, const char* name, const char* description)
{
- using namespace std;
declareFlag<T>(name, description, value, [&value](T const& val) {
value = val;
});
declareFlag<T>(name, description, value, [&value](T const& val) {
value = val;
});
@@
-170,8
+168,8
@@
typename std::enable_if<std::is_same<
bindFlag(T& value, const char* name, const char* description,
F callback)
{
bindFlag(T& value, const char* name, const char* description,
F callback)
{
- declareFlag(name, description, value, [&value,callback](const T& val) {
- if (
!
callback(val))
+ declareFlag(name, description, value, [&value,
callback](const T& val) {
+ if (
not
callback(val))
throw std::range_error("invalid value");
value = std::move(val);
});
throw std::range_error("invalid value");
value = std::move(val);
});