commit 9950f68af6256d121d44370ac3b6bfd267a796e0
author Austin Schuh <austin.linux@gmail.com> Sat Nov 06 15:27:58 2021 -0700
committer Austin Schuh <austin.linux@gmail.com> Sat Nov 06 15:27:58 2021 -0700
tree aff03c18c577ce51d0d92200a1b9279c9bfc7d46
parent dabc8ff9342f29147903347f4dde6e6a05a9543d
parent 812d0d18f8a83ab7e62014bfd52dd91a751f674d

Merge commit '4ee017201227ce16a4edef20912b357e8f303483' into master

Update WPILib for the 2022 beta test.  This now actually runs on my RIO
2.0!

Change-Id: I6d335f61c6abe50facca76f4f5014537e742f1ac
Signed-off-by: Austin Schuh <austin.linux@gmail.com>

frc971/wpilib/ahal/DriverStation.h

diff --git a/frc971/wpilib/ahal/DriverStation.h b/frc971/wpilib/ahal/DriverStation.h
index 2fbac9c..5150360 100644
--- a/frc971/wpilib/ahal/DriverStation.h
+++ b/frc971/wpilib/ahal/DriverStation.h
@@ -10,12 +10,13 @@
 #include <atomic>
 // #include <condition_variable>
 #include <memory>
+#include <functional>
 #include <string>
+#include <string_view>
 #include <thread>
 
 #include "hal/DriverStation.h"
 #include "frc971/wpilib/ahal/SensorBase.h"
-#include "wpi/Twine.h"
 
 namespace frc {
 
@@ -29,10 +30,10 @@
 
   virtual ~DriverStation();
   static DriverStation &GetInstance();
-  static void ReportError(const wpi::Twine &error);
-  static void ReportWarning(const wpi::Twine &error);
-  static void ReportError(bool is_error, int code, const wpi::Twine &error,
-                          const wpi::Twine &location, const wpi::Twine &stack);
+  static void ReportError(const std::string_view &error);
+  static void ReportWarning(const std::string_view &error);
+  static void ReportError(bool is_error, int code, const std::string_view &error,
+                          const std::string_view &location, const std::string_view &stack);
 
   static const int kJoystickPorts = 6;