diff --git a/xo-alloc2/include/xo/alloc2/gc/Collector.hpp b/xo-alloc2/include/xo/alloc2/Collector.hpp similarity index 54% rename from xo-alloc2/include/xo/alloc2/gc/Collector.hpp rename to xo-alloc2/include/xo/alloc2/Collector.hpp index 58d6bdeb..69bb90b0 100644 --- a/xo-alloc2/include/xo/alloc2/gc/Collector.hpp +++ b/xo-alloc2/include/xo/alloc2/Collector.hpp @@ -5,8 +5,8 @@ #pragma once -#include "ACollector.hpp" -#include "ICollector_Any.hpp" -#include "RCollector.hpp" +#include "gc/ACollector.hpp" +#include "gc/ICollector_Any.hpp" +#include "gc/RCollector.hpp" /* end Collector.hpp */ diff --git a/xo-alloc2/include/xo/alloc2/GCObject.hpp b/xo-alloc2/include/xo/alloc2/GCObject.hpp new file mode 100644 index 00000000..edc89c32 --- /dev/null +++ b/xo-alloc2/include/xo/alloc2/GCObject.hpp @@ -0,0 +1,13 @@ +/** @file GCObject.hpp + * + * @author Roland Conybeare, Dec 2025 + **/ + +#pragma once + +#include "gcobject/AGCObject.hpp" +#include "gcobject/IGCObject_Any.hpp" +#include "gcobject/IGCObject_Xfer.hpp" +#include "gcobject/RGCObject.hpp" + +/* end GCObject.hpp */ diff --git a/xo-alloc2/include/xo/alloc2/gc/ACollector.hpp b/xo-alloc2/include/xo/alloc2/gc/ACollector.hpp index 1c6d1cb4..da694e95 100644 --- a/xo-alloc2/include/xo/alloc2/gc/ACollector.hpp +++ b/xo-alloc2/include/xo/alloc2/gc/ACollector.hpp @@ -5,7 +5,7 @@ #pragma once -#include "IGCObject_Any.hpp" +#include "gcobject/IGCObject_Any.hpp" #include #include diff --git a/xo-alloc2/include/xo/alloc2/gc/AGCObject.hpp b/xo-alloc2/include/xo/alloc2/gcobject/AGCObject.hpp similarity index 100% rename from xo-alloc2/include/xo/alloc2/gc/AGCObject.hpp rename to xo-alloc2/include/xo/alloc2/gcobject/AGCObject.hpp diff --git a/xo-alloc2/include/xo/alloc2/gc/IGCObject_Any.hpp b/xo-alloc2/include/xo/alloc2/gcobject/IGCObject_Any.hpp similarity index 100% rename from xo-alloc2/include/xo/alloc2/gc/IGCObject_Any.hpp rename to xo-alloc2/include/xo/alloc2/gcobject/IGCObject_Any.hpp diff --git a/xo-alloc2/include/xo/alloc2/gc/IGCObject_Xfer.hpp b/xo-alloc2/include/xo/alloc2/gcobject/IGCObject_Xfer.hpp similarity index 100% rename from xo-alloc2/include/xo/alloc2/gc/IGCObject_Xfer.hpp rename to xo-alloc2/include/xo/alloc2/gcobject/IGCObject_Xfer.hpp diff --git a/xo-alloc2/include/xo/alloc2/gc/RGCObject.hpp b/xo-alloc2/include/xo/alloc2/gcobject/RGCObject.hpp similarity index 100% rename from xo-alloc2/include/xo/alloc2/gc/RGCObject.hpp rename to xo-alloc2/include/xo/alloc2/gcobject/RGCObject.hpp diff --git a/xo-alloc2/src/alloc2/IGCObject_Any.cpp b/xo-alloc2/src/alloc2/IGCObject_Any.cpp index f7b1336e..22e1cf48 100644 --- a/xo-alloc2/src/alloc2/IGCObject_Any.cpp +++ b/xo-alloc2/src/alloc2/IGCObject_Any.cpp @@ -3,7 +3,7 @@ * @author Roland Conybeare, Dec 2025 **/ -#include "gc/IGCObject_Any.hpp" +#include "gcobject/IGCObject_Any.hpp" #include namespace xo { diff --git a/xo-alloc2/utest/Collector.test.cpp b/xo-alloc2/utest/Collector.test.cpp index d23db5ee..4db1c29b 100644 --- a/xo-alloc2/utest/Collector.test.cpp +++ b/xo-alloc2/utest/Collector.test.cpp @@ -7,7 +7,7 @@ * see xo-object2/utest **/ -#include "gc/Collector.hpp" +#include "Collector.hpp" #include "gc/DX1Collector.hpp" #include #include diff --git a/xo-object2/include/xo/object2/DList.hpp b/xo-object2/include/xo/object2/DList.hpp index 06efd105..a9d02955 100644 --- a/xo-object2/include/xo/object2/DList.hpp +++ b/xo-object2/include/xo/object2/DList.hpp @@ -3,8 +3,8 @@ * @author Roland Conybeare, Dec 2025 **/ -#include "xo/alloc2/gc/RGCObject.hpp" -#include "xo/alloc2/gc/IGCObject_Any.hpp" +#include "xo/alloc2/GCObject.hpp" +//#include "xo/alloc2/gcobject/RGCObject.hpp" #include "xo/facet/obj.hpp" namespace xo { diff --git a/xo-object2/include/xo/object2/IGCObject_DFloat.hpp b/xo-object2/include/xo/object2/IGCObject_DFloat.hpp index a2da9223..6a96dcf5 100644 --- a/xo-object2/include/xo/object2/IGCObject_DFloat.hpp +++ b/xo-object2/include/xo/object2/IGCObject_DFloat.hpp @@ -6,8 +6,8 @@ #pragma once #include -#include -#include +#include +#include #include "DFloat.hpp" namespace xo { diff --git a/xo-object2/include/xo/object2/IGCObject_DInteger.hpp b/xo-object2/include/xo/object2/IGCObject_DInteger.hpp index 12fa7457..765d2d96 100644 --- a/xo-object2/include/xo/object2/IGCObject_DInteger.hpp +++ b/xo-object2/include/xo/object2/IGCObject_DInteger.hpp @@ -6,8 +6,8 @@ #pragma once #include "xo/alloc2/alloc/AAllocator.hpp" -#include -#include +#include +#include #include "DInteger.hpp" namespace xo { diff --git a/xo-object2/include/xo/object2/IGCObject_DList.hpp b/xo-object2/include/xo/object2/IGCObject_DList.hpp index ef599dcf..dc3ffa63 100644 --- a/xo-object2/include/xo/object2/IGCObject_DList.hpp +++ b/xo-object2/include/xo/object2/IGCObject_DList.hpp @@ -7,12 +7,12 @@ #include #include -#include +#include //#include //#include //#include -#include -#include +#include +#include #include "DList.hpp" namespace xo {