Merge branch 'master' into actor-yield

[simgrid.git] / include / xbt / config.hpp

diff --git a/include/xbt/config.hpp b/include/xbt/config.hpp
index 8299ced..d457e57 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. */
 
-#ifndef _XBT_CONFIG_HPP_
-#define _XBT_CONFIG_HPP_
+#ifndef XBT_CONFIG_HPP
+#define XBT_CONFIG_HPP
 
 #include <xbt/base.h>
 
@@ -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)
 {
-  using namespace std;
   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)
 {
-  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);
   });
@@ -240,5 +238,6 @@ public:
 
 }
 }
+XBT_PUBLIC(std::string) xbt_cfg_get_string(const char* name);
 
 #endif