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

Fix implicitly deleted move constructors (#1954)

Browse Source 
These were incorrect and exhibited as warnings on more recent versions of
clang (notably on Mac).

- Use pointers instead of references internally in GenericHID and *Drive
- Leave PIDBase, PIDController, and Resource non-moveable
- Remove the atomic from m_disabled in NidecBrushless
- Make Timer and Trigger copyable as well as moveable
- Implement custom move constructor/assignment for SendableChooserBase

Also comment out some unused variables that caused clang warnings.
This commit is contained in:
Peter Johnson
2019-10-19 11:36:44 -07:00
committed by GitHub
parent f3ad927f45
commit 2c50937975
19 changed files with 160 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
wpilibc/src/main/native/include/frc/GenericHID.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -179,7 +179,7 @@ class GenericHID : public ErrorBase {
void SetRumble(RumbleType type, double value);
private:
DriverStation& m_ds;
DriverStation* m_ds;
int m_port;
int m_outputs = 0;
uint16_t m_leftRumble = 0;

4
wpilibc/src/main/native/include/frc/NidecBrushless.h
View File

@@ -7,8 +7,6 @@
#pragma once
#include <atomic>
#include "frc/DigitalOutput.h"
#include "frc/ErrorBase.h"
#include "frc/MotorSafety.h"
@@ -102,7 +100,7 @@ class NidecBrushless : public SpeedController,
private:
bool m_isInverted = false;
std::atomic_bool m_disabled{false};
bool m_disabled = false;
DigitalOutput m_dio;
PWM m_pwm;
double m_speed = 0.0;

3
wpilibc/src/main/native/include/frc/PIDBase.h
View File

@@ -66,9 +66,6 @@ class PIDBase : public PIDInterface,
virtual ~PIDBase() = default;
PIDBase(PIDBase&&) = default;
PIDBase& operator=(PIDBase&&) = default;
/**
* Return the current PID result.
*

3
wpilibc/src/main/native/include/frc/PIDController.h
View File

@@ -102,9 +102,6 @@ class PIDController : public PIDBase, public Controller {
~PIDController() override;
PIDController(PIDController&&) = default;
PIDController& operator=(PIDController&&) = default;
/**
* Begin running the PIDController.
*/

5
wpilibc/src/main/native/include/frc/Resource.h
View File

@@ -1,5 +1,5 @@
/*----------------------------------------------------------------------------*/
/* Copyright (c) 2008-2018 FIRST. All Rights Reserved. */
/* Copyright (c) 2008-2019 FIRST. All Rights Reserved. */
/* Open Source Software - may be modified and shared by FRC teams. The code */
/* must be accompanied by the FIRST BSD license file in the root directory of */
/* the project. */
@@ -33,9 +33,6 @@ class Resource : public ErrorBase {
public:
virtual ~Resource() = default;
Resource(Resource&&) = default;
Resource& operator=(Resource&&) = default;
/**
* Factory method to create a Resource allocation-tracker *if* needed.
*

2
wpilibc/src/main/native/include/frc/Timer.h
View File

@@ -57,6 +57,8 @@ class Timer {
virtual ~Timer() = default;
Timer(const Timer& rhs);
Timer& operator=(const Timer& rhs);
Timer(Timer&& rhs);
Timer& operator=(Timer&& rhs);

6
wpilibc/src/main/native/include/frc/buttons/Trigger.h
View File

@@ -34,8 +34,10 @@ class Trigger : public Sendable, public SendableHelper<Trigger> {
Trigger() = default;
~Trigger() override = default;
Trigger(Trigger&&) = default;
Trigger& operator=(Trigger&&) = default;
Trigger(const Trigger& rhs);
Trigger& operator=(const Trigger& rhs);
Trigger(Trigger&& rhs);
Trigger& operator=(Trigger&& rhs);
bool Grab();
virtual bool Get() = 0;

4
wpilibc/src/main/native/include/frc/drive/DifferentialDrive.h
View File

@@ -212,8 +212,8 @@ class DifferentialDrive : public RobotDriveBase,
void InitSendable(SendableBuilder& builder) override;
private:
SpeedController& m_leftMotor;
SpeedController& m_rightMotor;
SpeedController* m_leftMotor;
SpeedController* m_rightMotor;
double m_quickStopThreshold = kDefaultQuickStopThreshold;
double m_quickStopAlpha = kDefaultQuickStopAlpha;

6
wpilibc/src/main/native/include/frc/drive/KilloughDrive.h
View File

@@ -132,9 +132,9 @@ class KilloughDrive : public RobotDriveBase,
void InitSendable(SendableBuilder& builder) override;
private:
SpeedController& m_leftMotor;
SpeedController& m_rightMotor;
SpeedController& m_backMotor;
SpeedController* m_leftMotor;
SpeedController* m_rightMotor;
SpeedController* m_backMotor;
Vector2d m_leftVec;
Vector2d m_rightVec;

8
wpilibc/src/main/native/include/frc/drive/MecanumDrive.h
View File

@@ -137,10 +137,10 @@ class MecanumDrive : public RobotDriveBase,
void InitSendable(SendableBuilder& builder) override;
private:
SpeedController& m_frontLeftMotor;
SpeedController& m_rearLeftMotor;
SpeedController& m_frontRightMotor;
SpeedController& m_rearRightMotor;
SpeedController* m_frontLeftMotor;
SpeedController* m_rearLeftMotor;
SpeedController* m_frontRightMotor;
SpeedController* m_rearRightMotor;
double m_rightSideInvertMultiplier = -1.0;

4
wpilibc/src/main/native/include/frc/smartdashboard/SendableChooserBase.h
View File

@@ -31,8 +31,8 @@ class SendableChooserBase : public Sendable,
SendableChooserBase();
~SendableChooserBase() override = default;
SendableChooserBase(SendableChooserBase&&) = default;
SendableChooserBase& operator=(SendableChooserBase&&) = default;
SendableChooserBase(SendableChooserBase&& oth);
SendableChooserBase& operator=(SendableChooserBase&& oth);
protected:
static constexpr const char* kDefault = "default";