From 54e9c76e037ce96d649ff8dfd7dac9631fabec65 Mon Sep 17 00:00:00 2001 From: Joseph Eng <91924258+KangarooKoala@users.noreply.github.com> Date: Sat, 28 Dec 2024 14:59:19 -0800 Subject: [PATCH] [wpilibc] Fully qualify names in error macros (#7601) --- wpilibc/src/main/native/include/frc/Errors.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/wpilibc/src/main/native/include/frc/Errors.h b/wpilibc/src/main/native/include/frc/Errors.h index 8cdb746bf4..3aae3e446d 100644 --- a/wpilibc/src/main/native/include/frc/Errors.h +++ b/wpilibc/src/main/native/include/frc/Errors.h @@ -147,10 +147,10 @@ namespace warn { * * @param[in] format error message format */ -#define FRC_ReportWarning(format, ...) \ - do { \ - ::frc::ReportError(warn::Warning, __FILE__, __LINE__, __FUNCTION__, \ - format __VA_OPT__(, ) __VA_ARGS__); \ +#define FRC_ReportWarning(format, ...) \ + do { \ + ::frc::ReportError(::frc::warn::Warning, __FILE__, __LINE__, __FUNCTION__, \ + format __VA_OPT__(, ) __VA_ARGS__); \ } while (0) /** @@ -186,7 +186,7 @@ namespace warn { #define FRC_AssertMessage(condition, format, ...) \ do { \ if (!(condition)) { \ - throw ::frc::MakeError(err::AssertionFailure, __FILE__, __LINE__, \ + throw ::frc::MakeError(::frc::err::AssertionFailure, __FILE__, __LINE__, \ __FUNCTION__, format __VA_OPT__(, ) __VA_ARGS__); \ } \ } while (0)