qosd: в миксины добавлен оператор конвертации в умный указатель
В отличие от метода `getNode()`, оператор конвертации будет публичным. А ещё он позволяет преобразовывать объект неявно.
This commit is contained in:
@@ -11,6 +11,7 @@ public:
|
|||||||
using ElemPtr = std::shared_ptr<TElem>;
|
using ElemPtr = std::shared_ptr<TElem>;
|
||||||
|
|
||||||
virtual ~ILinkMixin() = default;
|
virtual ~ILinkMixin() = default;
|
||||||
|
virtual operator std::shared_ptr<TElem>() = 0;
|
||||||
virtual void linkChild(const ElemPtr& child) = 0;
|
virtual void linkChild(const ElemPtr& child) = 0;
|
||||||
virtual void unlinkParent() = 0;
|
virtual void unlinkParent() = 0;
|
||||||
virtual const std::vector<ElemPtr>& children() = 0;
|
virtual const std::vector<ElemPtr>& children() = 0;
|
||||||
|
|||||||
@@ -17,6 +17,10 @@ public:
|
|||||||
Logger::get("ConDes").dbg("--- Destructor called for: BaseLinkMixin");
|
Logger::get("ConDes").dbg("--- Destructor called for: BaseLinkMixin");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
operator std::shared_ptr<INode>() override {
|
||||||
|
return this->getNode();
|
||||||
|
}
|
||||||
|
|
||||||
void linkChild(const ElemPtr& child) override {
|
void linkChild(const ElemPtr& child) override {
|
||||||
getLink()->addChild(child);
|
getLink()->addChild(child);
|
||||||
|
|
||||||
|
|||||||
@@ -34,10 +34,10 @@ protected:
|
|||||||
|
|
||||||
if (typeid(*child) == typeid(*this)) {
|
if (typeid(*child) == typeid(*this)) {
|
||||||
Logger::get("Mixin").dbg("--- Mutate to OneToMany");
|
Logger::get("Mixin").dbg("--- Mutate to OneToMany");
|
||||||
newLink = std::make_shared<OneToManyLink<TElem>>(this->getNode());
|
newLink = std::make_shared<OneToManyLink<TElem>>(*this);
|
||||||
} else {
|
} else {
|
||||||
Logger::get("Mixin").dbg("--- Mutate to OneToOne");
|
Logger::get("Mixin").dbg("--- Mutate to OneToOne");
|
||||||
newLink = std::make_shared<OneToOneLink<TElem>>(this->getNode());
|
newLink = std::make_shared<OneToOneLink<TElem>>(*this);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (newLink && this->link_)
|
if (newLink && this->link_)
|
||||||
|
|||||||
@@ -31,8 +31,7 @@ public:
|
|||||||
protected:
|
protected:
|
||||||
void lazyInit() {
|
void lazyInit() {
|
||||||
if (!link_) {
|
if (!link_) {
|
||||||
link_ = std::make_shared<TLink>(
|
link_ = std::make_shared<TLink>(*this);
|
||||||
BaseLinkMixin::getNode());
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
LinkPtr link_;
|
LinkPtr link_;
|
||||||
|
|||||||
Reference in New Issue
Block a user