Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-26 01:51:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add "override" qualifier to several headers.

Browse Source 
clang on Mac generates warnings for these.
This commit is contained in:
Peter Johnson
2017-08-20 09:46:28 -07:00
parent ae675ae4e1
commit 05d1cfa276
4 changed files with 19 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
wpilibc/src/main/native/include/Commands/PIDCommand.h
View File

@@ -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<PIDController> 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();

4
wpilibc/src/main/native/include/Commands/PIDSubsystem.h
View File

@@ -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);

12
wpilibc/src/main/native/include/DigitalInput.h
View File

@@ -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<ITable> subTable);
std::shared_ptr<ITable> GetTable() const;
void UpdateTable() override;
void StartLiveWindowMode() override;
void StopLiveWindowMode() override;
std::string GetSmartDashboardType() const override;
void InitTable(std::shared_ptr<ITable> subTable) override;
std::shared_ptr<ITable> GetTable() const override;
private:
int m_channel;

12
wpilibc/src/main/native/include/DigitalOutput.h
View File

@@ -46,12 +46,12 @@ class DigitalOutput : public DigitalSource,
void ValueChanged(ITable* source, llvm::StringRef key,
std::shared_ptr<nt::Value> value, bool isNew) override;
void UpdateTable();
void StartLiveWindowMode();
void StopLiveWindowMode();
std::string GetSmartDashboardType() const;
void InitTable(std::shared_ptr<ITable> subTable);
std::shared_ptr<ITable> GetTable() const;
void UpdateTable() override;
void StartLiveWindowMode() override;
void StopLiveWindowMode() override;
std::string GetSmartDashboardType() const override;
void InitTable(std::shared_ptr<ITable> subTable) override;
std::shared_ptr<ITable> GetTable() const override;
private:
int m_channel;