-/* Copyright (c) 2015-2020. The SimGrid Team. All rights reserved. */
+/* Copyright (c) 2015-2022. 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. */
#include <map>
#include <memory>
-namespace simgrid {
-namespace xbt {
+namespace simgrid::xbt {
/** @brief Return the property associated to the provided key (or nullptr if not existing) */
const char* PropertyHolder::get_property(const std::string& key) const
{
if (not properties_)
properties_ = std::make_unique<std::unordered_map<std::string, std::string>>();
- std::unordered_map<std::string, std::string> props(properties.cbegin(), properties.cend());
+ std::unordered_map<std::string, std::string> props(std::cbegin(properties), std::cend(properties));
#if __cplusplus >= 201703L
- props.merge(properties_);
+ props.merge(*properties_);
#else
props.insert(properties_->cbegin(), properties_->cend());
#endif
properties_->swap(props);
}
-template void PropertyHolder::set_properties(const std::map<std::string, std::string>& properties);
+template void PropertyHolder::set_properties(const std::map<std::string, std::string, std::less<>>& properties);
template void PropertyHolder::set_properties(const std::unordered_map<std::string, std::string>& properties);
-} // namespace xbt
-} // namespace simgrid
+} // namespace simgrid::xbt