[arccore,collections] Renomme 'eMemoryRessource' en 'eMemoryResource'.

Author: grospelliergilles

arccore/src/collections/arccore/collections/CollectionsGlobal.cc

@@ -43,18 +43,18 @@ namespace
     return "Invalid";
   }
 
-  const char* _toName(eMemoryRessource r)
+  const char* _toName(eMemoryResource r)
   {
     switch (r) {
-    case eMemoryRessource::Unknown:
+    case eMemoryResource::Unknown:
       return "Unknown";
-    case eMemoryRessource::Host:
+    case eMemoryResource::Host:
       return "Host";
-    case eMemoryRessource::HostPinned:
+    case eMemoryResource::HostPinned:
       return "HostPinned";
-    case eMemoryRessource::Device:
+    case eMemoryResource::Device:
       return "Device";
-    case eMemoryRessource::UnifiedMemory:
+    case eMemoryResource::UnifiedMemory:
       return "UnifiedMemory";
     }
     return "Invalid";
@@ -70,7 +70,7 @@ operator<<(std::ostream& o, eHostDeviceMemoryLocation v)
 }
 
 extern "C++" ARCCORE_COLLECTIONS_EXPORT std::ostream&
-operator<<(std::ostream& o, eMemoryRessource v)
+operator<<(std::ostream& o, eMemoryResource v)
 {
   o << _toName(v);
   return o;

arccore/src/collections/arccore/collections/CollectionsGlobal.h

@@ -118,7 +118,7 @@ operator<<(std::ostream& o, eHostDeviceMemoryLocation r);
 /*!
  * \brief Liste des ressources mémoire disponibles.
  */
-enum class eMemoryRessource
+enum class eMemoryResource
 {
   //! Valeur inconnue ou non initialisée
   Unknown = 0,
@@ -133,13 +133,13 @@ enum class eMemoryRessource
 };
 
 //! Nombre de valeurs valides pour eMemoryRessource
-static constexpr int ARCCORE_NB_MEMORY_RESSOURCE = 5;
+static constexpr int ARCCORE_NB_MEMORY_RESOURCE = 5;
 
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/
 
 extern "C++" ARCCORE_COLLECTIONS_EXPORT std::ostream&
-operator<<(std::ostream& o, eMemoryRessource r);
+operator<<(std::ostream& o, eMemoryResource r);
 
 /*---------------------------------------------------------------------------*/
 /*---------------------------------------------------------------------------*/

arccore/src/collections/arccore/collections/IMemoryAllocator.h

@@ -1,11 +1,11 @@
 // -*- tab-width: 2; indent-tabs-mode: nil; coding: utf-8-with-signature -*-
 //-----------------------------------------------------------------------------
-// Copyright 2000-2022 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
+// Copyright 2000-2024 CEA (www.cea.fr) IFPEN (www.ifpenergiesnouvelles.com)
 // See the top-level COPYRIGHT file for details.
 // SPDX-License-Identifier: Apache-2.0
 //-----------------------------------------------------------------------------
 /*---------------------------------------------------------------------------*/
-/* IMemoryAllocator.h                                          (C) 2000-2023 */
+/* IMemoryAllocator.h                                          (C) 2000-2024 */
 /*                                                                           */
 /* Interface d'un allocateur mémoire.                                        */
 /*---------------------------------------------------------------------------*/
@@ -140,7 +140,7 @@ class ARCCORE_COLLECTIONS_EXPORT IMemoryAllocator
   virtual void copyMemory(MemoryAllocationArgs args, AllocatedMemoryInfo destination, AllocatedMemoryInfo source);
 
   //! Ressource mémoire fournie par l'allocateur
-  virtual eMemoryRessource memoryRessource() const { return eMemoryRessource::Unknown; }
+  virtual eMemoryResource memoryRessource() const { return eMemoryResource::Unknown; }
 
  public: