Team2890/allwpilib
4
0
Fork 0
mirror of https://github.com/wpilibsuite/allwpilib synced 2026-06-30 02:31:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

[wpilibc] Use default copies and moves when possible (#3381)

Browse Source 
The removal of ErrorBase allowed the defaults to be used in more places.
This commit is contained in:
Tyler Veness
2021-05-25 20:54:39 -07:00
committed by GitHub
parent fb2a56e2d6
commit 7e1b27554c
6 changed files with 6 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
wpilibNewCommands/src/main/native/cpp/frc2/command/Command.cpp
View File

@@ -21,8 +21,6 @@ Command::~Command() {
CommandScheduler::GetInstance().Cancel(this);
}
Command::Command(const Command& rhs) = default;
Command& Command::operator=(const Command& rhs) {
m_isGrouped = false;
return *this;

4
wpilibNewCommands/src/main/native/include/frc2/command/Command.h
View File

@@ -50,8 +50,8 @@ class Command {
Command() = default;
virtual ~Command();
Command(const Command&);
Command& operator=(const Command&);
Command(const Command&) = default;
Command& operator=(const Command& rhs);
Command(Command&&) = default;
Command& operator=(Command&&) = default;

18
wpilibc/src/main/native/cpp/AnalogTrigger.cpp
View File

@@ -54,24 +54,6 @@ AnalogTrigger::~AnalogTrigger() {
}
}
AnalogTrigger::AnalogTrigger(AnalogTrigger&& rhs)
: SendableHelper(std::move(rhs)), m_trigger(std::move(rhs.m_trigger)) {
std::swap(m_analogInput, rhs.m_analogInput);
std::swap(m_dutyCycle, rhs.m_dutyCycle);
std::swap(m_ownsAnalog, rhs.m_ownsAnalog);
}
AnalogTrigger& AnalogTrigger::operator=(AnalogTrigger&& rhs) {
SendableHelper::operator=(std::move(rhs));
m_trigger = std::move(rhs.m_trigger);
std::swap(m_analogInput, rhs.m_analogInput);
std::swap(m_dutyCycle, rhs.m_dutyCycle);
std::swap(m_ownsAnalog, rhs.m_ownsAnalog);
return *this;
}
void AnalogTrigger::SetLimitsVoltage(double lower, double upper) {
int32_t status = 0;
HAL_SetAnalogTriggerLimitsVoltage(m_trigger, lower, upper, &status);

13
wpilibc/src/main/native/cpp/DigitalGlitchFilter.cpp
View File

@@ -46,19 +46,6 @@ DigitalGlitchFilter::~DigitalGlitchFilter() {
}
}
DigitalGlitchFilter::DigitalGlitchFilter(DigitalGlitchFilter&& rhs)
: SendableHelper(std::move(rhs)) {
std::swap(m_channelIndex, rhs.m_channelIndex);
}
DigitalGlitchFilter& DigitalGlitchFilter::operator=(DigitalGlitchFilter&& rhs) {
SendableHelper::operator=(std::move(rhs));
std::swap(m_channelIndex, rhs.m_channelIndex);
return *this;
}
void DigitalGlitchFilter::Add(DigitalSource* input) {
DoAdd(input, m_channelIndex + 1);
}

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

@@ -49,8 +49,8 @@ class AnalogTrigger : public Sendable, public SendableHelper<AnalogTrigger> {
~AnalogTrigger() override;
AnalogTrigger(AnalogTrigger&& rhs);
AnalogTrigger& operator=(AnalogTrigger&& rhs);
AnalogTrigger(AnalogTrigger&&) = default;
AnalogTrigger& operator=(AnalogTrigger&&) = default;
/**
* Set the upper and lower limits of the analog trigger.

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

@@ -32,8 +32,8 @@ class DigitalGlitchFilter : public Sendable,
DigitalGlitchFilter();
~DigitalGlitchFilter() override;
DigitalGlitchFilter(DigitalGlitchFilter&& rhs);
DigitalGlitchFilter& operator=(DigitalGlitchFilter&& rhs);
DigitalGlitchFilter(DigitalGlitchFilter&&) = default;
DigitalGlitchFilter& operator=(DigitalGlitchFilter&&) = default;
/**
* Assigns the DigitalSource to this glitch filter.