Merge branch 'master' into actor-yield

[simgrid.git] / src / surf / PropertyHolder.cpp

diff --git a/src/surf/PropertyHolder.cpp b/src/surf/PropertyHolder.cpp
index 03210a7..6298706 100644 (file)
--- a/src/surf/PropertyHolder.cpp
+++ b/src/surf/PropertyHolder.cpp
@@ -1,4 +1,4 @@
-/* Copyright (c) 2015. The SimGrid Team. All rights reserved.               */
+/* Copyright (c) 2015-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. */
@@ -8,35 +8,32 @@
 namespace simgrid {
 namespace surf {
 
-PropertyHolder::PropertyHolder() = default;
-
 PropertyHolder::~PropertyHolder() {
   delete properties_;
 }
 
 /** @brief Return the property associated to the provided key (or nullptr if not existing) */
-const char *PropertyHolder::getProperty(const char*key) {
+const char* PropertyHolder::getProperty(std::string key)
+{
   if (properties_ == nullptr)
     return nullptr;
-  try {
-    return properties_->at(key).c_str();
-  } catch (std::out_of_range& unfound) {
-    return nullptr;
-  }
+  auto prop = properties_->find(key);
+  return prop == properties_->end() ? nullptr : prop->second.c_str();
 }
 
 /** @brief Change the value of a given key in the property set */
-void PropertyHolder::setProperty(const char*key, const char*value) {
+void PropertyHolder::setProperty(std::string key, std::string value)
+{
   if (not properties_)
-    properties_       = new std::unordered_map<std::string, std::string>;
+    properties_       = new std::map<std::string, std::string>;
   (*properties_)[key] = value;
 }
 
 /** @brief Return the whole set of properties. Don't mess with it, dude! */
-std::unordered_map<std::string, std::string>* PropertyHolder::getProperties()
+std::map<std::string, std::string>* PropertyHolder::getProperties()
 {
   if (not properties_)
-    properties_ = new std::unordered_map<std::string, std::string>;
+    properties_ = new std::map<std::string, std::string>;
   return properties_;
 }