Skip to content

Commit c11c75d

Browse files
[arccore,collections] Corrige 'memoryRessource()' en 'memoryResource()' et retourne 'eMemoryResource::Host' pour les implémentations standards
1 parent 60c401f commit c11c75d

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

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

+5-1
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ class ARCCORE_COLLECTIONS_EXPORT IMemoryAllocator
140140
virtual void copyMemory(MemoryAllocationArgs args, AllocatedMemoryInfo destination, AllocatedMemoryInfo source);
141141

142142
//! Ressource mémoire fournie par l'allocateur
143-
virtual eMemoryResource memoryRessource() const { return eMemoryResource::Unknown; }
143+
virtual eMemoryResource memoryResource() const { return eMemoryResource::Unknown; }
144144

145145
public:
146146

@@ -278,6 +278,7 @@ class ARCCORE_COLLECTIONS_EXPORT DefaultMemoryAllocator
278278
void deallocate(void* ptr) override;
279279
size_t adjustCapacity(size_t wanted_capacity, size_t element_size) override;
280280
size_t guarantedAlignment() override { return 0; }
281+
eMemoryResource memoryResource() const override { return eMemoryResource::Host; }
281282
};
282283

283284
/*---------------------------------------------------------------------------*/
@@ -313,6 +314,7 @@ class ARCCORE_COLLECTIONS_EXPORT DefaultMemoryAllocator3
313314
void deallocate(MemoryAllocationArgs, AllocatedMemoryInfo ptr) override;
314315
Int64 adjustedCapacity(MemoryAllocationArgs, Int64 wanted_capacity, Int64 element_size) const override;
315316
size_t guarantedAlignment(MemoryAllocationArgs) const override { return 0; }
317+
eMemoryResource memoryResource() const override { return eMemoryResource::Host; }
316318
};
317319

318320
/*---------------------------------------------------------------------------*/
@@ -407,6 +409,7 @@ class ARCCORE_COLLECTIONS_EXPORT AlignedMemoryAllocator
407409
void deallocate(void* ptr) override;
408410
size_t adjustCapacity(size_t wanted_capacity, size_t element_size) override;
409411
size_t guarantedAlignment() override { return m_alignment; }
412+
eMemoryResource memoryResource() const override { return eMemoryResource::Host; }
410413

411414
private:
412415

@@ -494,6 +497,7 @@ class ARCCORE_COLLECTIONS_EXPORT AlignedMemoryAllocator3
494497
void deallocate(MemoryAllocationArgs args, AllocatedMemoryInfo ptr) override;
495498
Int64 adjustedCapacity(MemoryAllocationArgs args, Int64 wanted_capacity, Int64 element_size) const override;
496499
size_t guarantedAlignment(MemoryAllocationArgs) const override { return m_alignment; }
500+
eMemoryResource memoryResource() const override { return eMemoryResource::Host; }
497501

498502
private:
499503

0 commit comments

Comments
 (0)