diff --git a/xo-alloc2/src/alloc2/CMakeLists.txt b/xo-alloc2/src/alloc2/CMakeLists.txt index a93f7db0..2f60cc6a 100644 --- a/xo-alloc2/src/alloc2/CMakeLists.txt +++ b/xo-alloc2/src/alloc2/CMakeLists.txt @@ -4,7 +4,7 @@ set(SELF_LIB xo_alloc2) set(SELF_SRCS # AllocError.cpp - AllocInfo.cpp +# AllocInfo.cpp cmpresult.cpp AAllocator.cpp diff --git a/xo-alloc2/include/xo/alloc2/AllocInfo.hpp b/xo-arena/include/xo/arena/AllocInfo.hpp similarity index 100% rename from xo-alloc2/include/xo/alloc2/AllocInfo.hpp rename to xo-arena/include/xo/arena/AllocInfo.hpp diff --git a/xo-alloc2/src/alloc2/AllocInfo.cpp b/xo-arena/src/arena/AllocInfo.cpp similarity index 100% rename from xo-alloc2/src/alloc2/AllocInfo.cpp rename to xo-arena/src/arena/AllocInfo.cpp diff --git a/xo-arena/src/arena/CMakeLists.txt b/xo-arena/src/arena/CMakeLists.txt index bc969b7f..9a12405c 100644 --- a/xo-arena/src/arena/CMakeLists.txt +++ b/xo-arena/src/arena/CMakeLists.txt @@ -3,6 +3,7 @@ set(SELF_LIB xo_arena) set(SELF_SRCS AllocError.cpp + AllocInfo.cpp ) xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 ${SELF_SRCS}) diff --git a/xo-object2/utest/X1Collector.test.cpp b/xo-object2/utest/X1Collector.test.cpp index adfc9771..8b37c8ab 100644 --- a/xo-object2/utest/X1Collector.test.cpp +++ b/xo-object2/utest/X1Collector.test.cpp @@ -16,8 +16,7 @@ #include #include -#include - +#include #include #include