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
move ugly dict closer to the C APIs
[simgrid.git]
/
src
/
surf
/
PropertyHolder.cpp
diff --git
a/src/surf/PropertyHolder.cpp
b/src/surf/PropertyHolder.cpp
index
2eda708
..
03210a7
100644
(file)
--- a/
src/surf/PropertyHolder.cpp
+++ b/
src/surf/PropertyHolder.cpp
@@
-3,7
+3,6
@@
/* 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. */
-#include "xbt/sysdep.h"
#include "PropertyHolder.hpp"
namespace simgrid {
#include "PropertyHolder.hpp"
namespace simgrid {
@@
-12,27
+11,32
@@
namespace surf {
PropertyHolder::PropertyHolder() = default;
PropertyHolder::~PropertyHolder() {
PropertyHolder::PropertyHolder() = default;
PropertyHolder::~PropertyHolder() {
-
xbt_dict_free(&properties_)
;
+
delete properties_
;
}
/** @brief Return the property associated to the provided key (or nullptr if not existing) */
const char *PropertyHolder::getProperty(const char*key) {
if (properties_ == nullptr)
return nullptr;
}
/** @brief Return the property associated to the provided key (or nullptr if not existing) */
const char *PropertyHolder::getProperty(const char*key) {
if (properties_ == nullptr)
return nullptr;
- return static_cast<const char*>(xbt_dict_get_or_null(properties_,key));
+ try {
+ return properties_->at(key).c_str();
+ } catch (std::out_of_range& unfound) {
+ return nullptr;
+ }
}
/** @brief Change the value of a given key in the property set */
void PropertyHolder::setProperty(const char*key, const char*value) {
if (not properties_)
}
/** @brief Change the value of a given key in the property set */
void PropertyHolder::setProperty(const char*key, const char*value) {
if (not properties_)
- properties_
= xbt_dict_new_homogeneous(xbt_free_f)
;
-
xbt_dict_set(properties_, key, xbt_strdup(value), nullptr)
;
+ properties_
= new std::unordered_map<std::string, std::string>
;
+
(*properties_)[key] = value
;
}
/** @brief Return the whole set of properties. Don't mess with it, dude! */
}
/** @brief Return the whole set of properties. Don't mess with it, dude! */
-xbt_dict_t PropertyHolder::getProperties() {
+std::unordered_map<std::string, std::string>* PropertyHolder::getProperties()
+{
if (not properties_)
if (not properties_)
- properties_ =
xbt_dict_new_homogeneous(xbt_free_f)
;
+ properties_ =
new std::unordered_map<std::string, std::string>
;
return properties_;
}
return properties_;
}