Skip to content

Commit 4387cb4

Browse files
author
Your Name
committed
fix: do forward error(), exception() and fatal() to their generated counterparts
The previous commit forwarded these methods to the base class' version in the setTaskState case. This changes behavior, as currently the methods would be sending the state before RTT changes state, while with that previous change it would be done afterwards. Re-establish forwarding to the generated error(...), exception(...) and fatal(...) calls to keep behavior.
1 parent 775df89 commit 4387cb4

File tree

1 file changed

+0
-9
lines changed

1 file changed

+0
-9
lines changed

lib/orogen/templates/tasks/TaskBase.cpp

-9
Original file line numberDiff line numberDiff line change
@@ -78,21 +78,12 @@ void <%= task.basename %>Base::setupComponentInterface()
7878

7979
<% if task.extended_state_support? %>
8080

81-
#ifdef RTT_HAS_STATE_CHANGE_HOOK
82-
void <%= task.basename %>Base::error()
83-
{ return <%= superclass.name %>::error(); }
84-
void <%= task.basename %>Base::exception()
85-
{ return <%= superclass.name %>::exception(); }
86-
void <%= task.basename %>Base::fatal()
87-
{ return <%= superclass.name %>::fatal(); }
88-
#else
8981
void <%= task.basename %>Base::error()
9082
{ return error(RUNTIME_ERROR); }
9183
void <%= task.basename %>Base::exception()
9284
{ return exception(EXCEPTION); }
9385
void <%= task.basename %>Base::fatal()
9486
{ return fatal(FATAL_ERROR); }
95-
#endif
9687

9788
void <%= task.basename %>Base::report(States state)
9889
{

0 commit comments

Comments
 (0)