X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e63c67321577f0816604fe730cd0bc856970454d..2e36738d8ecb3284664acc4d4ee141362c4bf8d1:/src/xbt/PropertyHolder.cpp?ds=sidebyside diff --git a/src/xbt/PropertyHolder.cpp b/src/xbt/PropertyHolder.cpp index cc5a7b4b77..6bdafbd0fa 100644 --- a/src/xbt/PropertyHolder.cpp +++ b/src/xbt/PropertyHolder.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2015-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2015-2021. 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. */ @@ -41,7 +41,7 @@ template void PropertyHolder::set_properties(const Assoc& properti { if (not properties_) properties_ = std::make_unique>(); - std::unordered_map props(properties.cbegin(), properties.cend()); + std::unordered_map props(std::cbegin(properties), std::cend(properties)); #if __cplusplus >= 201703L props.merge(properties_); #else @@ -50,7 +50,7 @@ template void PropertyHolder::set_properties(const Assoc& properti properties_->swap(props); } -template void PropertyHolder::set_properties(const std::map& properties); +template void PropertyHolder::set_properties(const std::map>& properties); template void PropertyHolder::set_properties(const std::unordered_map& properties); } // namespace xbt