Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
labrobotica
ros
iri_core
iri_ros_tools
Commits
fc93cf0e
Commit
fc93cf0e
authored
Oct 18, 2017
by
Sergi Hernandez
Browse files
Added a return statement in all the functions returning a value.
Removed some unused internal variables.
parent
13d62b4e
Changes
4
Hide whitespace changes
Inline
Side-by-side
include/iri_ros_tools/module_action.h
View file @
fc93cf0e
...
...
@@ -503,8 +503,6 @@ class CModuleAction
template
<
class
action_ros
>
CModuleAction
<
action_ros
>::
CModuleAction
(
const
std
::
string
&
name
,
const
std
::
string
&
name_space
)
:
nh
(
ros
::
this_node
::
getName
()
+
"/"
+
name_space
)
{
std
::
size_t
position
;
this
->
name
=
this
->
nh
.
getNamespace
()
+
"/"
+
name
;
this
->
status
=
ACTION_IDLE
;
// retry control
...
...
include/iri_ros_tools/module_dyn_reconf.h
View file @
fc93cf0e
...
...
@@ -231,6 +231,7 @@ bool CModuleDynReconf::set_parameter(const std::string &name,bool value)
case
ACT_SRV_FAIL
:
ROS_ERROR_STREAM
(
"CModuleDynReconf::set_parameters: Request failed on server: "
<<
this
->
get_name
());
return
false
;
break
;
default:
return
false
;
}
}
...
...
@@ -255,6 +256,7 @@ bool CModuleDynReconf::set_parameter(const std::string &name,int value)
case
ACT_SRV_FAIL
:
ROS_ERROR_STREAM
(
"CModuleDynReconf::set_parameters: Request failed on server: "
<<
this
->
get_name
());
return
false
;
break
;
default:
return
false
;
}
}
...
...
@@ -279,6 +281,7 @@ bool CModuleDynReconf::set_parameter(const std::string &name,std::string &value)
case
ACT_SRV_FAIL
:
ROS_ERROR_STREAM
(
"CModuleDynReconf::set_parameters: Request failed on server: "
<<
this
->
get_name
());
return
false
;
break
;
default:
return
false
;
}
}
...
...
@@ -303,6 +306,7 @@ bool CModuleDynReconf::set_parameter(const std::string &name,double value)
case
ACT_SRV_FAIL
:
ROS_ERROR_STREAM
(
"CModuleDynReconf::set_parameters: Request failed on server: "
<<
this
->
get_name
());
return
false
;
break
;
default:
return
false
;
}
}
...
...
include/iri_ros_tools/module_service.h
View file @
fc93cf0e
...
...
@@ -171,8 +171,6 @@ class CModuleService
template
<
class
service_msg
>
CModuleService
<
service_msg
>::
CModuleService
(
const
std
::
string
&
name
,
const
std
::
string
&
name_space
)
:
nh
(
ros
::
this_node
::
getName
()
+
"/"
+
name_space
)
{
std
::
size_t
position
;
this
->
current_num_retries
=
0
;
this
->
max_num_retries
=
DEFAULT_SERVICE_MAX_RETRIES
;
this
->
service_client
=
this
->
nh
.
template
serviceClient
<
service_msg
>(
name
);
...
...
src/timeout.cpp
View file @
fc93cf0e
...
...
@@ -44,6 +44,8 @@ bool CROSTimeout::timed_out(void)
return
false
;
}
}
else
return
false
;
}
CROSTimeout
::~
CROSTimeout
()
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment