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

[wpilibc] Move NullDeleter from frc/Base.h to wpi/NullDeleter.h (#3387)

Browse Source 
frc/Base.h was also deleted because it's now empty.
This commit is contained in:
Tyler Veness
2021-05-26 07:24:53 -07:00
committed by GitHub
parent cb0051ae60
commit f4e2d26d58
16 changed files with 48 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
wpilibc/src/main/native/cpp/AnalogEncoder.cpp
View File

@@ -4,8 +4,9 @@
#include "frc/AnalogEncoder.h"
#include <wpi/NullDeleter.h>
#include "frc/AnalogInput.h"
#include "frc/Base.h"
#include "frc/Counter.h"
#include "frc/Errors.h"
#include "frc/smartdashboard/SendableBuilder.h"
@@ -16,14 +17,14 @@ AnalogEncoder::AnalogEncoder(int channel)
: AnalogEncoder(std::make_shared<AnalogInput>(channel)) {}
AnalogEncoder::AnalogEncoder(AnalogInput& analogInput)
: m_analogInput{&analogInput, NullDeleter<AnalogInput>{}},
: m_analogInput{&analogInput, wpi::NullDeleter<AnalogInput>{}},
m_analogTrigger{m_analogInput.get()},
m_counter{} {
Init();
}
AnalogEncoder::AnalogEncoder(AnalogInput* analogInput)
: m_analogInput{analogInput, NullDeleter<AnalogInput>{}},
: m_analogInput{analogInput, wpi::NullDeleter<AnalogInput>{}},
m_analogTrigger{m_analogInput.get()},
m_counter{} {
Init();