From 166291cfefe001ce56ba1531ba5cffecd71d707c Mon Sep 17 00:00:00 2001 From: Peter Barker Date: Fri, 22 Feb 2019 10:12:05 +1100 Subject: [PATCH] SITL: add missing override keywords --- libraries/SITL/SIM_BalanceBot.h | 2 +- libraries/SITL/SIM_Balloon.h | 2 +- libraries/SITL/SIM_CRRCSim.h | 2 +- libraries/SITL/SIM_Calibration.h | 2 +- libraries/SITL/SIM_FlightAxis.h | 2 +- libraries/SITL/SIM_Gazebo.h | 4 ++-- libraries/SITL/SIM_Helicopter.h | 2 +- libraries/SITL/SIM_JSBSim.h | 2 +- libraries/SITL/SIM_Morse.h | 2 +- libraries/SITL/SIM_Multicopter.h | 2 +- libraries/SITL/SIM_Plane.h | 2 +- libraries/SITL/SIM_Rover.h | 2 +- libraries/SITL/SIM_Sailboat.h | 2 +- libraries/SITL/SIM_SingleCopter.h | 2 +- libraries/SITL/SIM_Tracker.h | 2 +- libraries/SITL/SIM_XPlane.h | 2 +- libraries/SITL/SIM_last_letter.h | 2 +- 17 files changed, 18 insertions(+), 18 deletions(-) diff --git a/libraries/SITL/SIM_BalanceBot.h b/libraries/SITL/SIM_BalanceBot.h index ba919dbc96..eec2e11eb2 100644 --- a/libraries/SITL/SIM_BalanceBot.h +++ b/libraries/SITL/SIM_BalanceBot.h @@ -27,7 +27,7 @@ public: BalanceBot(const char *home_str, const char *frame_str); /* update model by one time step */ - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) { diff --git a/libraries/SITL/SIM_Balloon.h b/libraries/SITL/SIM_Balloon.h index 3ddcaa185c..a6c80b699a 100644 --- a/libraries/SITL/SIM_Balloon.h +++ b/libraries/SITL/SIM_Balloon.h @@ -30,7 +30,7 @@ public: Balloon(const char *home_str, const char *frame_str); /* update model by one time step */ - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) { diff --git a/libraries/SITL/SIM_CRRCSim.h b/libraries/SITL/SIM_CRRCSim.h index 17f30fc6a5..75da72e12a 100644 --- a/libraries/SITL/SIM_CRRCSim.h +++ b/libraries/SITL/SIM_CRRCSim.h @@ -32,7 +32,7 @@ public: CRRCSim(const char *home_str, const char *frame_str); /* update model by one time step */ - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) { diff --git a/libraries/SITL/SIM_Calibration.h b/libraries/SITL/SIM_Calibration.h index ab4411176b..0892d21cd4 100644 --- a/libraries/SITL/SIM_Calibration.h +++ b/libraries/SITL/SIM_Calibration.h @@ -66,7 +66,7 @@ class Calibration : public Aircraft { public: Calibration(const char *home_str, const char *frame_str); - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; static Aircraft *create(const char *home_str, const char *frame_str) { return new Calibration(home_str, frame_str); diff --git a/libraries/SITL/SIM_FlightAxis.h b/libraries/SITL/SIM_FlightAxis.h index 7327ec0519..86b730e528 100644 --- a/libraries/SITL/SIM_FlightAxis.h +++ b/libraries/SITL/SIM_FlightAxis.h @@ -32,7 +32,7 @@ public: FlightAxis(const char *home_str, const char *frame_str); /* update model by one time step */ - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) { diff --git a/libraries/SITL/SIM_Gazebo.h b/libraries/SITL/SIM_Gazebo.h index 72b29988ca..027a0b10c0 100644 --- a/libraries/SITL/SIM_Gazebo.h +++ b/libraries/SITL/SIM_Gazebo.h @@ -31,7 +31,7 @@ public: Gazebo(const char *home_str, const char *frame_str); /* update model by one time step */ - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) { @@ -39,7 +39,7 @@ public: } /* Create and set in/out socket for Gazebo simulator */ - void set_interface_ports(const char* address, const int port_in, const int port_out); + void set_interface_ports(const char* address, const int port_in, const int port_out) override; private: /* diff --git a/libraries/SITL/SIM_Helicopter.h b/libraries/SITL/SIM_Helicopter.h index 856c1e02e5..c345042506 100644 --- a/libraries/SITL/SIM_Helicopter.h +++ b/libraries/SITL/SIM_Helicopter.h @@ -30,7 +30,7 @@ public: Helicopter(const char *home_str, const char *frame_str); /* update model by one time step */ - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) { diff --git a/libraries/SITL/SIM_JSBSim.h b/libraries/SITL/SIM_JSBSim.h index 6740c727a5..d1fe3b6e99 100644 --- a/libraries/SITL/SIM_JSBSim.h +++ b/libraries/SITL/SIM_JSBSim.h @@ -32,7 +32,7 @@ public: JSBSim(const char *home_str, const char *frame_str); /* update model by one time step */ - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) { diff --git a/libraries/SITL/SIM_Morse.h b/libraries/SITL/SIM_Morse.h index 3c7de83978..0a453b75c2 100644 --- a/libraries/SITL/SIM_Morse.h +++ b/libraries/SITL/SIM_Morse.h @@ -31,7 +31,7 @@ public: Morse(const char *home_str, const char *frame_str); /* update model by one time step */ - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) { diff --git a/libraries/SITL/SIM_Multicopter.h b/libraries/SITL/SIM_Multicopter.h index 2d9c88c6fb..075629a3f5 100644 --- a/libraries/SITL/SIM_Multicopter.h +++ b/libraries/SITL/SIM_Multicopter.h @@ -32,7 +32,7 @@ public: MultiCopter(const char *home_str, const char *frame_str); /* update model by one time step */ - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) { diff --git a/libraries/SITL/SIM_Plane.h b/libraries/SITL/SIM_Plane.h index f45cc05b78..cf2cc8736b 100644 --- a/libraries/SITL/SIM_Plane.h +++ b/libraries/SITL/SIM_Plane.h @@ -32,7 +32,7 @@ public: Plane(const char *home_str, const char *frame_str); /* update model by one time step */ - virtual void update(const struct sitl_input &input); + virtual void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) { diff --git a/libraries/SITL/SIM_Rover.h b/libraries/SITL/SIM_Rover.h index aba357d697..2477337493 100644 --- a/libraries/SITL/SIM_Rover.h +++ b/libraries/SITL/SIM_Rover.h @@ -30,7 +30,7 @@ public: SimRover(const char *home_str, const char *frame_str); /* update model by one time step */ - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) { diff --git a/libraries/SITL/SIM_Sailboat.h b/libraries/SITL/SIM_Sailboat.h index c960091089..e95978269c 100644 --- a/libraries/SITL/SIM_Sailboat.h +++ b/libraries/SITL/SIM_Sailboat.h @@ -30,7 +30,7 @@ public: Sailboat(const char *home_str, const char *frame_str); /* update model by one time step */ - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) { diff --git a/libraries/SITL/SIM_SingleCopter.h b/libraries/SITL/SIM_SingleCopter.h index 00aee84550..5ecceb54e1 100644 --- a/libraries/SITL/SIM_SingleCopter.h +++ b/libraries/SITL/SIM_SingleCopter.h @@ -31,7 +31,7 @@ public: SingleCopter(const char *home_str, const char *frame_str); /* update model by one time step */ - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) { diff --git a/libraries/SITL/SIM_Tracker.h b/libraries/SITL/SIM_Tracker.h index 46c10c3e8f..858e33e8e9 100644 --- a/libraries/SITL/SIM_Tracker.h +++ b/libraries/SITL/SIM_Tracker.h @@ -28,7 +28,7 @@ namespace SITL { class Tracker : public Aircraft { public: Tracker(const char *home_str, const char *frame_str); - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) { diff --git a/libraries/SITL/SIM_XPlane.h b/libraries/SITL/SIM_XPlane.h index 421a80ddfa..165aad8f1b 100644 --- a/libraries/SITL/SIM_XPlane.h +++ b/libraries/SITL/SIM_XPlane.h @@ -32,7 +32,7 @@ public: XPlane(const char *home_str, const char *frame_str); /* update model by one time step */ - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) { diff --git a/libraries/SITL/SIM_last_letter.h b/libraries/SITL/SIM_last_letter.h index 65df3b2a9e..96cb15808a 100644 --- a/libraries/SITL/SIM_last_letter.h +++ b/libraries/SITL/SIM_last_letter.h @@ -32,7 +32,7 @@ public: last_letter(const char *home_str, const char *frame_str); /* update model by one time step */ - void update(const struct sitl_input &input); + void update(const struct sitl_input &input) override; /* static object creator */ static Aircraft *create(const char *home_str, const char *frame_str) {