diff --git a/xo-alloc2/include/xo/alloc2/arena/ArenaConfig.hpp b/xo-alloc2/include/xo/alloc2/arena/ArenaConfig.hpp index fcd95347..4d79637b 100644 --- a/xo-alloc2/include/xo/alloc2/arena/ArenaConfig.hpp +++ b/xo-alloc2/include/xo/alloc2/arena/ArenaConfig.hpp @@ -6,7 +6,6 @@ #pragma once #include "AllocHeaderConfig.hpp" -//#include "alloc/AllocError.hpp" #include #include diff --git a/xo-alloc2/src/alloc2/CMakeLists.txt b/xo-alloc2/src/alloc2/CMakeLists.txt index 2f60cc6a..ac1ae656 100644 --- a/xo-alloc2/src/alloc2/CMakeLists.txt +++ b/xo-alloc2/src/alloc2/CMakeLists.txt @@ -8,7 +8,7 @@ set(SELF_SRCS cmpresult.cpp AAllocator.cpp - ArenaConfig.cpp +# ArenaConfig.cpp DArena.cpp IAllocator_Any.cpp IAllocator_DArena.cpp diff --git a/xo-alloc2/include/xo/alloc2/ArenaConfig.hpp b/xo-arena/include/xo/arena/ArenaConfig.hpp similarity index 100% rename from xo-alloc2/include/xo/alloc2/ArenaConfig.hpp rename to xo-arena/include/xo/arena/ArenaConfig.hpp diff --git a/xo-alloc2/src/alloc2/ArenaConfig.cpp b/xo-arena/src/arena/ArenaConfig.cpp similarity index 99% rename from xo-alloc2/src/alloc2/ArenaConfig.cpp rename to xo-arena/src/arena/ArenaConfig.cpp index 7f4e4248..d08feb46 100644 --- a/xo-alloc2/src/alloc2/ArenaConfig.cpp +++ b/xo-arena/src/arena/ArenaConfig.cpp @@ -4,6 +4,7 @@ **/ #include "ArenaConfig.hpp" + namespace xo { namespace mm { ArenaConfig diff --git a/xo-arena/src/arena/CMakeLists.txt b/xo-arena/src/arena/CMakeLists.txt index 9a12405c..345e9cc9 100644 --- a/xo-arena/src/arena/CMakeLists.txt +++ b/xo-arena/src/arena/CMakeLists.txt @@ -4,6 +4,7 @@ set(SELF_LIB xo_arena) set(SELF_SRCS AllocError.cpp AllocInfo.cpp + ArenaConfig.cpp ) xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 ${SELF_SRCS})