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

10
wpilibc/src/main/native/cpp/Ultrasonic.cpp
View File

@@ -7,8 +7,8 @@
#include <utility>
#include <hal/FRCUsageReporting.h>
#include <wpi/NullDeleter.h>
#include "frc/Base.h"
#include "frc/Counter.h"
#include "frc/DigitalInput.h"
#include "frc/DigitalOutput.h"
@@ -36,8 +36,8 @@ Ultrasonic::Ultrasonic(int pingChannel, int echoChannel)
}
Ultrasonic::Ultrasonic(DigitalOutput* pingChannel, DigitalInput* echoChannel)
: m_pingChannel(pingChannel, NullDeleter<DigitalOutput>()),
m_echoChannel(echoChannel, NullDeleter<DigitalInput>()),
: m_pingChannel(pingChannel, wpi::NullDeleter<DigitalOutput>()),
m_echoChannel(echoChannel, wpi::NullDeleter<DigitalInput>()),
m_counter(m_echoChannel) {
if (!pingChannel) {
throw FRC_MakeError(err::NullParameter, "{}", "pingChannel");
@@ -49,8 +49,8 @@ Ultrasonic::Ultrasonic(DigitalOutput* pingChannel, DigitalInput* echoChannel)
}
Ultrasonic::Ultrasonic(DigitalOutput& pingChannel, DigitalInput& echoChannel)
: m_pingChannel(&pingChannel, NullDeleter<DigitalOutput>()),
m_echoChannel(&echoChannel, NullDeleter<DigitalInput>()),
: m_pingChannel(&pingChannel, wpi::NullDeleter<DigitalOutput>()),
m_echoChannel(&echoChannel, wpi::NullDeleter<DigitalInput>()),
m_counter(m_echoChannel) {
Initialize();
}