fup

include/ifaces/ILink.h

@@ -1,11 +1,8 @@
 #pragma once
 #include <memory>
 #include <vector>
+#include "ifaces/INode.h"
 
-// Forward declarations
-class INode;
-class ILink;
-using NodePtr = std::shared_ptr<INode>;
 using LinkPtr = std::shared_ptr<ILink>;
 
 class ILink {

include/ifaces/ILinkMixin.h

@@ -1,11 +1,6 @@
 #pragma once
 #include <memory>
-
-// Forward declarations для избежания циклических #include
-class INode;
-class ILink;
-using NodePtr = std::shared_ptr<INode>;
-using LinkPtr = std::shared_ptr<ILink>;
+#include "decls.h"
 
 class ILinkMixin {
 public:
@@ -13,5 +8,4 @@ public:
 	virtual void linkChild(const NodePtr& child) = 0;
 	virtual void unlinkParent() = 0;
 	virtual LinkPtr getLink() = 0;
-	virtual NodePtr getNode() = 0;
 };

include/ifaces/INode.h

@@ -1,8 +1,9 @@
 #pragma once
 #include "ifaces/ILinkMixin.h"
-#include "ifaces/ILink.h"
 #include <string>
 
+using NodePtr = std::shared_ptr<INode>;
+
 class INode : public virtual ILinkMixin {
 public:
 	~INode() = default;