Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Sub: rename parameter to avoid name conflict with lock

This commit is contained in:
Peter Barker 2019-09-12 19:51:25 +10:00 committed by Peter Barker
parent 5d1261da73
commit 5ebf27ac61
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArduSub/GCS_Mavlink.cpp
View File

@ -446,11 +446,11 @@ MAV_RESULT GCS_MAVLINK_Sub::handle_command_do_set_roi(const Location &roi_loc)
return MAV_RESULT_ACCEPTED;
}
bool GCS_MAVLINK_Sub::set_home_to_current_location(bool lock) {
return sub.set_home_to_current_location(lock);
bool GCS_MAVLINK_Sub::set_home_to_current_location(bool _lock) {
return sub.set_home_to_current_location(_lock);
}
bool GCS_MAVLINK_Sub::set_home(const Location& loc, bool lock) {
return sub.set_home(loc, lock);
bool GCS_MAVLINK_Sub::set_home(const Location& loc, bool _lock) {
return sub.set_home(loc, _lock);
}