[arcane,mesh] Prend en compte la nouvelle option CMake pour le choix …

…de l'implémentation de 'ItemInternalMap'.
arcaneframework · Oct 9, 2024 · 3122e5c · 3122e5c
1 parent a9ced60
commit 3122e5c
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/arcane/src/arcane/mesh/DynamicMesh.cc b/arcane/src/arcane/mesh/DynamicMesh.cc
@@ -260,8 +260,8 @@ DynamicMesh(ISubDomain* sub_domain,const MeshBuildInfo& mbi, bool is_submesh)
   m_item_internal_list._internalSetFaceSharedInfo(m_face_family->commonItemSharedInfo());
   m_item_internal_list._internalSetCellSharedInfo(m_cell_family->commonItemSharedInfo());
 
-  info() << "Is AMR Activated? = " << m_is_amr_activated;
-  info() << "AMR type = " << m_amr_type;
+  info() << "Is AMR Activated? = " << m_is_amr_activated
+         << "AMR type = " << m_amr_type;
 
   _printConnectivityPolicy();
 
@@ -374,7 +374,8 @@ build()
 {
   Trace::Setter mci(traceMng(),_className());
 
-  info() << "Building DynamicMesh=" << this << " name=" << name();
+  info() << "Building DynamicMesh name=" << name()
+         << " ItemInternalMapImpl=" << ItemInternalMap::UseNewImpl;
 
   m_tied_interface_mng = new TiedInterfaceMng(this);
 

diff --git a/arcane/src/arcane/mesh/ItemInternalMap.h b/arcane/src/arcane/mesh/ItemInternalMap.h
@@ -19,8 +19,7 @@
 
 #include "arcane/mesh/MeshGlobal.h"
 #include "arcane/core/ItemInternal.h"
-
-#include <unordered_map>
+#include "arcane/utils/HashTableMap2.h"
 
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
@@ -61,12 +60,12 @@ class ItemInternalMap
  private:
 
   using LegacyImpl = HashTableMapT<Int64, ItemInternal*>;
-  using NewImpl = std::unordered_map<Int64, ItemInternal*>;
+  using NewImpl = impl::HashTableMap2<Int64, ItemInternal*>;
   using BaseData = LegacyImpl::Data;
 
  public:
 
-#ifdef ARCANE_USE_NEW_IMPL_FOR_ITEMINTERNALMAP
+#ifdef ARCANE_USE_HASHTABLEMAP2_FOR_ITEMINTERNALMAP
   static constexpr bool UseNewImpl = 1;
 #else
   static constexpr bool UseNewImpl = 0;