From 5f29621b381f224417580636ecb63520a701be99 Mon Sep 17 00:00:00 2001 From: Marika Lehmann Date: Wed, 7 Dec 2022 18:54:47 +0100 Subject: [PATCH] iox-#1732 Fix Bazel build Signed-off-by: Marika Lehmann --- iceoryx_hoofs/BUILD.bazel | 1 + iceoryx_posh/include/iceoryx_posh/internal/mepoo/mem_pool.hpp | 4 ++-- iceoryx_posh/source/mepoo/mem_pool.cpp | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/iceoryx_hoofs/BUILD.bazel b/iceoryx_hoofs/BUILD.bazel index 6a27c7e4c69..188de70223c 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 15ab719d248..67584662829 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 b4456ec9ea5..89d1638db53 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)