X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e63c67321577f0816604fe730cd0bc856970454d..8f7ec2e4b08cd2b27aa34b2c9fec2af0ad79d53a:/src/xbt/PropertyHolder.cpp

diff --git a/src/xbt/PropertyHolder.cpp b/src/xbt/PropertyHolder.cpp
index cc5a7b4b77..bb798c9f90 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-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. */
@@ -41,16 +41,16 @@ 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_);
+  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