diff --git a/include/xo/alloc/Object.hpp b/include/xo/alloc/Object.hpp index 2468c8bc..2c11ea9e 100644 --- a/include/xo/alloc/Object.hpp +++ b/include/xo/alloc/Object.hpp @@ -64,7 +64,7 @@ namespace xo { * 3. return the location of the copy make in step 1. * * @p src. source object to be forwarded - * @p gc. garbage collector + * @p gc. allocator (poassibly garbage collector) */ static IObject * _forward(IObject * src, gc::IAlloc * gc); diff --git a/utest/Forwarding1.test.cpp b/utest/Forwarding1.test.cpp index 19d9bf1e..f0a81c14 100644 --- a/utest/Forwarding1.test.cpp +++ b/utest/Forwarding1.test.cpp @@ -23,7 +23,7 @@ namespace xo { gp member() const { return member_; } void assign_member(Object * x) { - Object::mm->assign_member(this, member_.ptr_address(), x); + Object::mm->assign_member(this, reinterpret_cast(member_.ptr_address()), x); } TaggedPtr self_tp() const final override { @@ -33,7 +33,7 @@ namespace xo { void display(std::ostream & os) const final override { os << data_; } virtual std::size_t _shallow_size() const final override { return sizeof(*this); } - virtual Object * _shallow_copy(gc::IAlloc * mm) const final override { return new (Cpof(mm, this)) DummyObject(*this); } + virtual IObject * _shallow_copy(gc::IAlloc * mm) const final override { return new (Cpof(mm, this)) DummyObject(*this); } virtual std::size_t _forward_children(gc::IAlloc * gc) final override { return _shallow_size(); } private: diff --git a/utest/IAlloc.test.cpp b/utest/IAlloc.test.cpp index b0214749..823791ab 100644 --- a/utest/IAlloc.test.cpp +++ b/utest/IAlloc.test.cpp @@ -3,7 +3,7 @@ * author: Roland Conybeare, Aug 2025 */ -#include "xo/alloc/IAlloc.hpp" +#include "xo/allocutil/IAlloc.hpp" #include namespace xo {