diff --git a/wpilibc/src/main/native/cpp/Notifier.cpp b/wpilibc/src/main/native/cpp/Notifier.cpp index 147beb4003..81cd017c24 100644 --- a/wpilibc/src/main/native/cpp/Notifier.cpp +++ b/wpilibc/src/main/native/cpp/Notifier.cpp @@ -161,11 +161,6 @@ void Notifier::SetName(std::string_view name) { HAL_SetNotifierName(m_notifier, buf.data(), &status); } -void Notifier::SetHandler(std::function callback) { - std::scoped_lock lock(m_processMutex); - m_callback = callback; -} - void Notifier::SetCallback(std::function callback) { std::scoped_lock lock(m_processMutex); m_callback = callback; diff --git a/wpilibc/src/main/native/include/frc/Notifier.h b/wpilibc/src/main/native/include/frc/Notifier.h index 0bd54d46f7..53e980f474 100644 --- a/wpilibc/src/main/native/include/frc/Notifier.h +++ b/wpilibc/src/main/native/include/frc/Notifier.h @@ -82,15 +82,6 @@ class Notifier { */ void SetName(std::string_view name); - /** - * Change the callback function. - * - * @param callback The callback function. - * @deprecated Use SetCallback() instead. - */ - [[deprecated("Use SetCallback() instead.")]] - void SetHandler(std::function callback); - /** * Change the callback function. * diff --git a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java index 8f381a03ff..1529af5bc6 100644 --- a/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java +++ b/wpilibj/src/main/java/edu/wpi/first/wpilibj/Notifier.java @@ -155,22 +155,6 @@ public class Notifier implements AutoCloseable { NotifierJNI.setNotifierName(m_notifier.get(), name); } - /** - * Change the callback function. - * - * @param callback The callback function. - * @deprecated Use setCallback() instead. - */ - @Deprecated(forRemoval = true, since = "2024") - public void setHandler(Runnable callback) { - m_processLock.lock(); - try { - m_callback = callback; - } finally { - m_processLock.unlock(); - } - } - /** * Change the callback function. *