diff --git a/CMakeLists.txt b/CMakeLists.txt index 1735dd5..09ebb96 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -48,7 +48,7 @@ xo_add_genfacetimpl( # note: manual target; generated code committed to git xo_add_genfacetimpl( TARGET xo-object2-facetimpl-gcobject-list - FACET_PKG xo_gc + FACET_PKG xo_alloc2 FACET GCObject REPR List INPUT idl/IGCObject_DList.json5 @@ -68,7 +68,7 @@ xo_add_genfacetimpl( # note: manual target; generated code committed to git xo_add_genfacetimpl( TARGET xo-object2-facetimpl-gcobject-boolean - FACET_PKG xo_gc + FACET_PKG xo_alloc2 FACET GCObject REPR Boolean INPUT idl/IGCObject_DBoolean.json5 @@ -88,7 +88,7 @@ xo_add_genfacetimpl( # note: manual target; generated code committed to git xo_add_genfacetimpl( TARGET xo-object2-facetimpl-gcobject-float - FACET_PKG xo_gc + FACET_PKG xo_alloc2 FACET GCObject REPR Float INPUT idl/IGCObject_DFloat.json5 @@ -108,7 +108,7 @@ xo_add_genfacetimpl( # note: manual target; generated code committed to git xo_add_genfacetimpl( TARGET xo-object2-facetimpl-gcobject-integer - FACET_PKG xo_gc + FACET_PKG xo_alloc2 FACET GCObject REPR Integer INPUT idl/IGCObject_DInteger.json5 @@ -137,7 +137,7 @@ xo_add_genfacetimpl( # note: manual target; generated code committed to git xo_add_genfacetimpl( TARGET xo-object2-facetimpl-gcobject-array - FACET_PKG xo_gc + FACET_PKG xo_alloc2 FACET GCObject REPR Array INPUT idl/IGCObject_DArray.json5 @@ -157,7 +157,7 @@ xo_add_genfacetimpl( # note: manual target; generated code committed to git xo_add_genfacetimpl( TARGET xo-object2-facetimpl-gcobject-dictionary - FACET_PKG xo_gc + FACET_PKG xo_alloc2 FACET GCObject REPR Dictionary INPUT idl/IGCObject_DDictionary.json5 @@ -177,7 +177,7 @@ xo_add_genfacetimpl( # note: manual target; generated code committed to git xo_add_genfacetimpl( TARGET xo-object2-facetimpl-gcobject-runtimeerror - FACET_PKG xo_gc + FACET_PKG xo_alloc2 FACET GCObject REPR RuntimeError INPUT idl/IGCObject_DRuntimeError.json5 diff --git a/cmake/xo_object2Config.cmake.in b/cmake/xo_object2Config.cmake.in index 78ee9e0..b34f76f 100644 --- a/cmake/xo_object2Config.cmake.in +++ b/cmake/xo_object2Config.cmake.in @@ -2,8 +2,8 @@ include(CMakeFindDependencyMacro) find_dependency(reflect) -find_dependency(xo_gc) find_dependency(xo_stringtable2) +find_dependency(xo_alloc2) find_dependency(xo_printable2) find_dependency(subsys) find_dependency(indentlog) diff --git a/idl/IGCObject_DArray.json5 b/idl/IGCObject_DArray.json5 index bef5bd6..96507a7 100644 --- a/idl/IGCObject_DArray.json5 +++ b/idl/IGCObject_DArray.json5 @@ -4,7 +4,7 @@ output_hpp_dir: "include/xo/object2", output_impl_subdir: "array", includes: [ - "", + "", "" ], local_types: [ ], diff --git a/idl/IGCObject_DBoolean.json5 b/idl/IGCObject_DBoolean.json5 index c9aaf26..c739ccd 100644 --- a/idl/IGCObject_DBoolean.json5 +++ b/idl/IGCObject_DBoolean.json5 @@ -4,8 +4,8 @@ output_hpp_dir: "include/xo/object2", output_impl_subdir: "boolean", includes: [ - "", - "" +// "", +// "" ], local_types: [ ], namespace1: "xo", diff --git a/idl/IGCObject_DDictionary.json5 b/idl/IGCObject_DDictionary.json5 index 636413b..ebf8fd8 100644 --- a/idl/IGCObject_DDictionary.json5 +++ b/idl/IGCObject_DDictionary.json5 @@ -4,7 +4,7 @@ output_hpp_dir: "include/xo/object2", output_impl_subdir: "dictionary", includes: [ - "", + "", "" ], local_types: [ ], diff --git a/idl/IGCObject_DFloat.json5 b/idl/IGCObject_DFloat.json5 index eec1e3e..2255f41 100644 --- a/idl/IGCObject_DFloat.json5 +++ b/idl/IGCObject_DFloat.json5 @@ -5,7 +5,7 @@ output_impl_subdir: "number", includes: [ "", - "", + "", "" ], local_types: [ ], diff --git a/idl/IGCObject_DInteger.json5 b/idl/IGCObject_DInteger.json5 index 37d603e..1809330 100644 --- a/idl/IGCObject_DInteger.json5 +++ b/idl/IGCObject_DInteger.json5 @@ -4,7 +4,7 @@ output_hpp_dir: "include/xo/object2", output_impl_subdir: "number", includes: [ - "", + "", "" ], local_types: [ ], diff --git a/idl/IGCObject_DList.json5 b/idl/IGCObject_DList.json5 index 28fb335..ecb4898 100644 --- a/idl/IGCObject_DList.json5 +++ b/idl/IGCObject_DList.json5 @@ -4,7 +4,7 @@ output_hpp_dir: "include/xo/object2", output_impl_subdir: "list", includes: [ -// "", +// "", // "" ], local_types: [ ], diff --git a/idl/IGCObject_DRuntimeError.json5 b/idl/IGCObject_DRuntimeError.json5 index cfcbe9f..a0e1504 100644 --- a/idl/IGCObject_DRuntimeError.json5 +++ b/idl/IGCObject_DRuntimeError.json5 @@ -4,7 +4,7 @@ output_hpp_dir: "include/xo/object2", output_impl_subdir: "error", includes: [ -// "", +// "", // "" ], local_types: [ ], diff --git a/idl/Sequence.json5 b/idl/Sequence.json5 index 2027169..0b022f0 100644 --- a/idl/Sequence.json5 +++ b/idl/Sequence.json5 @@ -3,7 +3,7 @@ output_cpp_dir: "src/object2", output_hpp_dir: "include/xo/object2", output_impl_subdir: "sequence", - includes: [""], + includes: [""], // extra includes in Sequence.hpp, if any user_hpp_includes: [], namespace1: "xo", diff --git a/include/xo/object2/array/IGCObject_DArray.hpp b/include/xo/object2/array/IGCObject_DArray.hpp index 08f78aa..6eb571e 100644 --- a/include/xo/object2/array/IGCObject_DArray.hpp +++ b/include/xo/object2/array/IGCObject_DArray.hpp @@ -64,4 +64,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end */ +/* end */ \ No newline at end of file diff --git a/include/xo/object2/boolean/IGCObject_DBoolean.hpp b/include/xo/object2/boolean/IGCObject_DBoolean.hpp index 358aad1..9afd964 100644 --- a/include/xo/object2/boolean/IGCObject_DBoolean.hpp +++ b/include/xo/object2/boolean/IGCObject_DBoolean.hpp @@ -14,8 +14,6 @@ #pragma once #include "GCObject.hpp" -#include -#include #include "DBoolean.hpp" namespace xo { namespace scm { class IGCObject_DBoolean; } } @@ -64,4 +62,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end */ +/* end */ \ No newline at end of file diff --git a/include/xo/object2/dictionary/IGCObject_DDictionary.hpp b/include/xo/object2/dictionary/IGCObject_DDictionary.hpp index 7fe1bc5..2d69f99 100644 --- a/include/xo/object2/dictionary/IGCObject_DDictionary.hpp +++ b/include/xo/object2/dictionary/IGCObject_DDictionary.hpp @@ -64,4 +64,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end */ +/* end */ \ No newline at end of file diff --git a/include/xo/object2/number/GCObjectConversion_DFloat.hpp b/include/xo/object2/number/GCObjectConversion_DFloat.hpp index 959eeca..4cc4751 100644 --- a/include/xo/object2/number/GCObjectConversion_DFloat.hpp +++ b/include/xo/object2/number/GCObjectConversion_DFloat.hpp @@ -7,7 +7,7 @@ #include "DFloat.hpp" #include "number/IGCObject_DFloat.hpp" -#include +#include namespace xo { namespace scm { diff --git a/include/xo/object2/number/GCObjectConversion_DInteger.hpp b/include/xo/object2/number/GCObjectConversion_DInteger.hpp index 458312c..5b01e57 100644 --- a/include/xo/object2/number/GCObjectConversion_DInteger.hpp +++ b/include/xo/object2/number/GCObjectConversion_DInteger.hpp @@ -7,7 +7,7 @@ #include "DInteger.hpp" #include "number/IGCObject_DInteger.hpp" -#include +#include namespace xo { namespace scm { diff --git a/include/xo/object2/number/IGCObject_DFloat.hpp b/include/xo/object2/number/IGCObject_DFloat.hpp index b8e15b7..ee2eecf 100644 --- a/include/xo/object2/number/IGCObject_DFloat.hpp +++ b/include/xo/object2/number/IGCObject_DFloat.hpp @@ -65,4 +65,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end */ +/* end */ \ No newline at end of file diff --git a/include/xo/object2/number/IGCObject_DInteger.hpp b/include/xo/object2/number/IGCObject_DInteger.hpp index fd2ea64..799372a 100644 --- a/include/xo/object2/number/IGCObject_DInteger.hpp +++ b/include/xo/object2/number/IGCObject_DInteger.hpp @@ -64,4 +64,4 @@ namespace xo { } /*namespace scm*/ } /*namespace xo*/ -/* end */ +/* end */ \ No newline at end of file diff --git a/src/object2/CMakeLists.txt b/src/object2/CMakeLists.txt index f0aaefb..b2370cf 100644 --- a/src/object2/CMakeLists.txt +++ b/src/object2/CMakeLists.txt @@ -45,8 +45,8 @@ set(SELF_SRCS xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 ${SELF_SRCS}) # note: deps here must also appear in cmake/xo_object2Config.cmake.in xo_dependency(${SELF_LIB} reflect) -xo_dependency(${SELF_LIB} xo_gc) xo_dependency(${SELF_LIB} xo_stringtable2) +xo_dependency(${SELF_LIB} xo_alloc2) xo_dependency(${SELF_LIB} xo_printable2) xo_dependency(${SELF_LIB} subsys) xo_dependency(${SELF_LIB} indentlog) diff --git a/src/object2/ISequence_Any.cpp b/src/object2/ISequence_Any.cpp index 77da7d3..5e0583f 100644 --- a/src/object2/ISequence_Any.cpp +++ b/src/object2/ISequence_Any.cpp @@ -3,8 +3,8 @@ **/ #include "sequence/ISequence_Any.hpp" -#include #include +#include namespace xo { namespace scm { diff --git a/utest/CMakeLists.txt b/utest/CMakeLists.txt index 7843e0e..e4532c2 100644 --- a/utest/CMakeLists.txt +++ b/utest/CMakeLists.txt @@ -12,5 +12,6 @@ set(UTEST_SRCS xo_add_utest_executable(${UTEST_EXE} ${UTEST_SRCS}) xo_self_dependency(${UTEST_EXE} xo_object2) +xo_dependency(${UTEST_EXE} xo_gc) #xo_dependency(${UTEST_EXE} randomgen) xo_external_target_dependency(${UTEST_EXE} Catch2 Catch2::Catch2) diff --git a/utest/Printable.test.cpp b/utest/Printable.test.cpp index 15de595..edf230a 100644 --- a/utest/Printable.test.cpp +++ b/utest/Printable.test.cpp @@ -20,7 +20,8 @@ #include #include -#include + +#include #include #include