diff --git a/wpilibc/src/main/native/include/Commands/PIDCommand.h b/wpilibc/src/main/native/include/Commands/PIDCommand.h index 4cc426ee44..3f86b5034c 100644 --- a/wpilibc/src/main/native/include/Commands/PIDCommand.h +++ b/wpilibc/src/main/native/include/Commands/PIDCommand.h @@ -32,16 +32,16 @@ class PIDCommand : public Command, public PIDOutput, public PIDSource { void SetSetpointRelative(double deltaSetpoint); // PIDOutput interface - virtual void PIDWrite(double output); + void PIDWrite(double output) override; // PIDSource interface - virtual double PIDGet(); + double PIDGet() override; protected: std::shared_ptr GetPIDController() const; - virtual void _Initialize(); - virtual void _Interrupted(); - virtual void _End(); + void _Initialize() override; + void _Interrupted() override; + void _End() override; void SetSetpoint(double setpoint); double GetSetpoint() const; double GetPosition(); diff --git a/wpilibc/src/main/native/include/Commands/PIDSubsystem.h b/wpilibc/src/main/native/include/Commands/PIDSubsystem.h index d73aef6fd2..25089f52f2 100644 --- a/wpilibc/src/main/native/include/Commands/PIDSubsystem.h +++ b/wpilibc/src/main/native/include/Commands/PIDSubsystem.h @@ -42,10 +42,10 @@ class PIDSubsystem : public Subsystem, public PIDOutput, public PIDSource { void Disable(); // PIDOutput interface - virtual void PIDWrite(double output); + void PIDWrite(double output) override; // PIDSource interface - virtual double PIDGet(); + double PIDGet() override; void SetSetpoint(double setpoint); void SetSetpointRelative(double deltaSetpoint); void SetInputRange(double minimumInput, double maximumInput); diff --git a/wpilibc/src/main/native/include/DigitalInput.h b/wpilibc/src/main/native/include/DigitalInput.h index 896f5da142..7c2db1b1dc 100644 --- a/wpilibc/src/main/native/include/DigitalInput.h +++ b/wpilibc/src/main/native/include/DigitalInput.h @@ -37,12 +37,12 @@ class DigitalInput : public DigitalSource, public LiveWindowSendable { AnalogTriggerType GetAnalogTriggerTypeForRouting() const override; bool IsAnalogTrigger() const override; - void UpdateTable(); - void StartLiveWindowMode(); - void StopLiveWindowMode(); - std::string GetSmartDashboardType() const; - void InitTable(std::shared_ptr subTable); - std::shared_ptr GetTable() const; + void UpdateTable() override; + void StartLiveWindowMode() override; + void StopLiveWindowMode() override; + std::string GetSmartDashboardType() const override; + void InitTable(std::shared_ptr subTable) override; + std::shared_ptr GetTable() const override; private: int m_channel; diff --git a/wpilibc/src/main/native/include/DigitalOutput.h b/wpilibc/src/main/native/include/DigitalOutput.h index 8431191506..28fe87ae41 100644 --- a/wpilibc/src/main/native/include/DigitalOutput.h +++ b/wpilibc/src/main/native/include/DigitalOutput.h @@ -46,12 +46,12 @@ class DigitalOutput : public DigitalSource, void ValueChanged(ITable* source, llvm::StringRef key, std::shared_ptr value, bool isNew) override; - void UpdateTable(); - void StartLiveWindowMode(); - void StopLiveWindowMode(); - std::string GetSmartDashboardType() const; - void InitTable(std::shared_ptr subTable); - std::shared_ptr GetTable() const; + void UpdateTable() override; + void StartLiveWindowMode() override; + void StopLiveWindowMode() override; + std::string GetSmartDashboardType() const override; + void InitTable(std::shared_ptr subTable) override; + std::shared_ptr GetTable() const override; private: int m_channel;