xo-alloc2 xo-object2 : refactor to build on osx
This commit is contained in:
parent
c7486ba674
commit
cbf6abb539
16 changed files with 182 additions and 100 deletions
|
|
@ -14,6 +14,7 @@ set(SELF_SRCS
|
|||
DFloat.cpp
|
||||
DInteger.cpp
|
||||
object2_register_types.cpp
|
||||
object2_register_facets.cpp
|
||||
)
|
||||
|
||||
xo_add_shared_library4(${SELF_LIB} ${PROJECT_NAME}Targets ${PROJECT_VERSION} 1 ${SELF_SRCS})
|
||||
|
|
|
|||
|
|
@ -141,7 +141,6 @@ namespace xo {
|
|||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
} /*namespace scm*/
|
||||
} /*namespace xo*/
|
||||
|
||||
|
|
|
|||
|
|
@ -4,6 +4,7 @@
|
|||
**/
|
||||
|
||||
#include "IGCObject_DList.hpp"
|
||||
#include "DList.hpp"
|
||||
#include <xo/indentlog/scope.hpp>
|
||||
|
||||
namespace xo {
|
||||
|
|
@ -46,7 +47,6 @@ namespace xo {
|
|||
|
||||
return shallow_size(src);
|
||||
}
|
||||
|
||||
} /*namespace scm*/
|
||||
} /*namespace xo*/
|
||||
|
||||
|
|
|
|||
|
|
@ -25,4 +25,4 @@ namespace xo {
|
|||
} /*namespace scm*/
|
||||
} /*namespace xo*/
|
||||
|
||||
/* end IPrintable_DList.cpp */
|
||||
/* end IPrintable_DList.cpp */
|
||||
|
|
|
|||
|
|
@ -11,6 +11,7 @@
|
|||
* [idl/ISequence_DList.json5]
|
||||
**/
|
||||
|
||||
#include "IGCObject_DList.hpp" // apparently need this with clang 15
|
||||
#include "ISequence_DList.hpp"
|
||||
|
||||
namespace xo {
|
||||
|
|
@ -37,4 +38,4 @@ namespace xo {
|
|||
} /*namespace scm*/
|
||||
} /*namespace xo*/
|
||||
|
||||
/* end ISequence_DList.cpp */
|
||||
/* end ISequence_DList.cpp */
|
||||
|
|
|
|||
57
xo-object2/src/object2/object2_register_facets.cpp
Normal file
57
xo-object2/src/object2/object2_register_facets.cpp
Normal file
|
|
@ -0,0 +1,57 @@
|
|||
/** @file object2_register_facets.cpp
|
||||
*
|
||||
* @author Roland Conybeare, Jan 2026
|
||||
**/
|
||||
|
||||
#include "object2_register_facets.hpp"
|
||||
#include <xo/object2/IGCObject_DList.hpp>
|
||||
#include <xo/object2/IGCObject_DFloat.hpp>
|
||||
#include <xo/object2/IGCObject_DInteger.hpp>
|
||||
|
||||
#include <xo/object2/IPrintable_DList.hpp>
|
||||
#include <xo/object2/IPrintable_DFloat.hpp>
|
||||
#include <xo/object2/IPrintable_DInteger.hpp>
|
||||
|
||||
#include <xo/printable2/detail/APrintable.hpp>
|
||||
#include <xo/alloc2/alloc/AAllocator.hpp>
|
||||
#include <xo/facet/FacetRegistry.hpp>
|
||||
#include <xo/indentlog/scope.hpp>
|
||||
|
||||
namespace xo {
|
||||
using xo::print::APrintable;
|
||||
using xo::mm::AAllocator;
|
||||
using xo::mm::AGCObject;
|
||||
using xo::scm::DList;
|
||||
using xo::scm::DFloat;
|
||||
using xo::facet::FacetRegistry;
|
||||
using xo::facet::typeseq;
|
||||
|
||||
namespace scm {
|
||||
bool
|
||||
object2_register_facets()
|
||||
{
|
||||
scope log(XO_DEBUG(true));
|
||||
|
||||
FacetRegistry::register_impl<AGCObject, DList>();
|
||||
FacetRegistry::register_impl<APrintable, DList>();
|
||||
|
||||
FacetRegistry::register_impl<AGCObject, DFloat>();
|
||||
FacetRegistry::register_impl<APrintable, DFloat>();
|
||||
|
||||
FacetRegistry::register_impl<AGCObject, DInteger>();
|
||||
FacetRegistry::register_impl<APrintable, DInteger>();
|
||||
|
||||
log && log(xtag("DList.tseq", typeseq::id<DList>()));
|
||||
log && log(xtag("DFloat.tseq", typeseq::id<DFloat>()));
|
||||
log && log(xtag("DInteger.tseq", typeseq::id<DInteger>()));
|
||||
|
||||
log && log(xtag("AAllocator.tseq", typeseq::id<AAllocator>()));
|
||||
log && log(xtag("APrintable.tseq", typeseq::id<APrintable>()));
|
||||
log && log(xtag("AGCObject.tseq", typeseq::id<AGCObject>()));
|
||||
|
||||
return true;
|
||||
}
|
||||
} /*namespace scm*/
|
||||
} /*namespace xo*/
|
||||
|
||||
/* end object2_register_facets.cpp */
|
||||
|
|
@ -17,18 +17,17 @@
|
|||
#include <xo/indentlog/scope.hpp>
|
||||
|
||||
namespace xo {
|
||||
using xo::print::APrintable;
|
||||
using xo::mm::AAllocator;
|
||||
// using xo::print::APrintable;
|
||||
// using xo::mm::AAllocator;
|
||||
using xo::mm::ACollector;
|
||||
using xo::mm::AGCObject;
|
||||
using xo::mm::IGCObject_Any;
|
||||
using xo::facet::FacetRegistry;
|
||||
// using xo::mm::IGCObject_Any;
|
||||
// using xo::facet::FacetRegistry;
|
||||
using xo::facet::impl_for;
|
||||
using xo::facet::typeseq;
|
||||
using xo::scope;
|
||||
|
||||
namespace scm {
|
||||
|
||||
bool
|
||||
object2_register_types(obj<ACollector> gc)
|
||||
{
|
||||
|
|
@ -42,31 +41,6 @@ namespace xo {
|
|||
|
||||
return ok;
|
||||
}
|
||||
|
||||
bool
|
||||
object2_register_facets()
|
||||
{
|
||||
scope log(XO_DEBUG(true));
|
||||
|
||||
FacetRegistry::register_impl<AGCObject, DList>();
|
||||
FacetRegistry::register_impl<APrintable, DList>();
|
||||
|
||||
FacetRegistry::register_impl<AGCObject, DFloat>();
|
||||
// FacetRegistry::register_impl<APrintable, DFloat>();
|
||||
|
||||
FacetRegistry::register_impl<AGCObject, DInteger>();
|
||||
FacetRegistry::register_impl<APrintable, DInteger>();
|
||||
|
||||
log && log(xtag("DList.tseq", typeseq::id<DList>()));
|
||||
log && log(xtag("DFloat.tseq", typeseq::id<DFloat>()));
|
||||
log && log(xtag("DInteger.tseq", typeseq::id<DInteger>()));
|
||||
|
||||
log && log(xtag("AAllocator.tseq", typeseq::id<AAllocator>()));
|
||||
log && log(xtag("APrintable.tseq", typeseq::id<APrintable>()));
|
||||
log && log(xtag("AGCObject.tseq", typeseq::id<AGCObject>()));
|
||||
|
||||
return true;
|
||||
}
|
||||
}
|
||||
} /*namespace xo*/
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue