-/** @brief Return the property associated to the provided key (or NULL if not existing) */
-const char *PropertyHolder::getProperty(const char*key) {
- if (properties_ == NULL)
- return NULL;
- return (const char*) xbt_dict_get_or_null(properties_,key);
+/** @brief Return the property associated to the provided key (or nullptr if not existing) */
+const char* PropertyHolder::getProperty(std::string key)
+{
+ if (properties_ == nullptr)
+ return nullptr;
+ auto prop = properties_->find(key);
+ return prop == properties_->end() ? nullptr : prop->second.c_str();