Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
RobotAPI
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container Registry
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Software
ArmarX
RobotAPI
Commits
026cee89
Commit
026cee89
authored
3 years ago
by
Christian Dreher
Browse files
Options
Downloads
Patches
Plain Diff
refactor: Virtual dtor seems to be required to be public. (shared_ptr delete).
parent
0c85e2e1
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
source/RobotAPI/libraries/aron/core/navigator/data/NavigatorFactory.h
+10
-11
10 additions, 11 deletions
...API/libraries/aron/core/navigator/data/NavigatorFactory.h
with
10 additions
and
11 deletions
source/RobotAPI/libraries/aron/core/navigator/data/NavigatorFactory.h
+
10
−
11
View file @
026cee89
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment