diff --git a/iceoryx_hoofs/BUILD.bazel b/iceoryx_hoofs/BUILD.bazel index 6a27c7e4c6..188de70223 100644 --- a/iceoryx_hoofs/BUILD.bazel +++ b/iceoryx_hoofs/BUILD.bazel @@ -33,6 +33,7 @@ cc_library( "source/**/*.cpp", "vocabulary/source/**/*.cpp", "source/**/*.hpp", + "memory/source/*.cpp", ]), hdrs = glob(["include/**"]) + glob(["legacy/**"]) + glob(["memory/**"]) + glob(["container/**"]) + glob(["vocabulary/**"]) + [ ":iceoryx_hoofs_deployment_hpp", diff --git a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mem_pool.hpp b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mem_pool.hpp index 15ab719d24..6758466282 100644 --- a/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mem_pool.hpp +++ b/iceoryx_posh/include/iceoryx_posh/internal/mepoo/mem_pool.hpp @@ -52,8 +52,8 @@ class MemPool MemPool(const cxx::greater_or_equal chunkSize, const cxx::greater_or_equal numberOfChunks, - BumpAllocator& managementAllocator, - BumpAllocator& chunkMemoryAllocator) noexcept; + iox::BumpAllocator& managementAllocator, + iox::BumpAllocator& chunkMemoryAllocator) noexcept; MemPool(const MemPool&) = delete; MemPool(MemPool&&) = delete; diff --git a/iceoryx_posh/source/mepoo/mem_pool.cpp b/iceoryx_posh/source/mepoo/mem_pool.cpp index b4456ec9ea..89d1638db5 100644 --- a/iceoryx_posh/source/mepoo/mem_pool.cpp +++ b/iceoryx_posh/source/mepoo/mem_pool.cpp @@ -41,8 +41,8 @@ constexpr uint64_t MemPool::CHUNK_MEMORY_ALIGNMENT; MemPool::MemPool(const cxx::greater_or_equal chunkSize, const cxx::greater_or_equal numberOfChunks, - BumpAllocator& managementAllocator, - BumpAllocator& chunkMemoryAllocator) noexcept + iox::BumpAllocator& managementAllocator, + iox::BumpAllocator& chunkMemoryAllocator) noexcept : m_chunkSize(chunkSize) , m_numberOfChunks(numberOfChunks) , m_minFree(numberOfChunks)