Skip to content
Snippets Groups Projects
Commit 026cee89 authored by Christian Dreher's avatar Christian Dreher
Browse files

refactor: Virtual dtor seems to be required to be public. (shared_ptr delete).

parent 0c85e2e1
No related branches found
No related tags found
No related merge requests found
......@@ -31,8 +31,8 @@
#include <RobotAPI/libraries/aron/core/navigator/NavigatorFactory.h>
// ArmarX
#include <RobotAPI/libraries/aron/core/navigator/data/Navigator.h>
#include <RobotAPI/libraries/aron/core/Descriptor.h>
#include <RobotAPI/libraries/aron/core/navigator/data/Navigator.h>
namespace armarx::aron::datanavigator
{
......@@ -40,27 +40,26 @@ namespace armarx::aron::datanavigator
typedef std::shared_ptr<NavigatorFactory> NavigatorFactoryPtr;
class NavigatorFactory :
virtual public armarx::aron::NavigatorFactory<data::AronDataPtr, datanavigator::NavigatorPtr, data::Descriptor>
virtual public armarx::aron::
NavigatorFactory<data::AronDataPtr, datanavigator::NavigatorPtr, data::Descriptor>
{
public:
NavigatorFactory() = default;
virtual ~NavigatorFactory() = default;
virtual NavigatorPtr create(const data::AronDataPtr&, const Path&) const override;
virtual NavigatorPtr createSpecific(const data::AronDataPtr&, const Path&) const override;
protected:
virtual ~NavigatorFactory() = default;
};
// Factories
#define RUN_ARON_MACRO(upperType, lowerType, capsType) \
class upperType##NavigatorFactory : \
virtual public NavigatorFactory \
{ \
public: \
upperType##NavigatorFactory() = default; \
#define RUN_ARON_MACRO(upperType, lowerType, capsType) \
class upperType##NavigatorFactory : virtual public NavigatorFactory \
{ \
public: \
upperType##NavigatorFactory() = default; \
virtual NavigatorPtr createSpecific(const data::AronDataPtr&, const Path&) const override; \
};
HANDLE_ALL_ARON_DATA
#undef RUN_ARON_MACRO
}
} // namespace armarx::aron::datanavigator
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment