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
Merge branch 'master' of framagit.org:simgrid/simgrid
[simgrid.git]
/
src
/
xbt
/
PropertyHolder.cpp
diff --git
a/src/xbt/PropertyHolder.cpp
b/src/xbt/PropertyHolder.cpp
index 00ca79751bace4d38342b574ab42202c67c04779..6bdafbd0fa687e468b87499e8fd7630e7d31949c 100644
(file)
--- a/
src/xbt/PropertyHolder.cpp
+++ b/
src/xbt/PropertyHolder.cpp
@@
-41,7
+41,7
@@
template <class Assoc> void PropertyHolder::set_properties(const Assoc& properti
{
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_);
#else