diff --git a/wpimath/src/main/native/include/frc/controller/proto/SimpleMotorFeedforwardProto.h b/wpimath/src/main/native/include/frc/controller/proto/SimpleMotorFeedforwardProto.h index 522856f784e..c65b88decd4 100644 --- a/wpimath/src/main/native/include/frc/controller/proto/SimpleMotorFeedforwardProto.h +++ b/wpimath/src/main/native/include/frc/controller/proto/SimpleMotorFeedforwardProto.h @@ -4,7 +4,6 @@ #pragma once -#include #include #include "frc/controller/SimpleMotorFeedforward.h" @@ -13,7 +12,7 @@ // frc::SimpleMotorFeedforward template -struct WPILIB_DLLEXPORT wpi::Protobuf> { +struct wpi::Protobuf> { static google::protobuf::Message* New(google::protobuf::Arena* arena); static frc::SimpleMotorFeedforward Unpack( const google::protobuf::Message& msg); diff --git a/wpimath/src/main/native/include/frc/controller/struct/SimpleMotorFeedforwardStruct.h b/wpimath/src/main/native/include/frc/controller/struct/SimpleMotorFeedforwardStruct.h index f6269f72666..375b47e4cad 100644 --- a/wpimath/src/main/native/include/frc/controller/struct/SimpleMotorFeedforwardStruct.h +++ b/wpimath/src/main/native/include/frc/controller/struct/SimpleMotorFeedforwardStruct.h @@ -4,7 +4,6 @@ #pragma once -#include #include #include "frc/controller/SimpleMotorFeedforward.h" @@ -13,7 +12,7 @@ // frc::SimpleMotorFeedforward template -struct WPILIB_DLLEXPORT wpi::Struct> { +struct wpi::Struct> { static constexpr std::string_view GetTypeString() { return "struct:SimpleMotorFeedforward"; } diff --git a/wpimath/src/main/native/include/frc/kinematics/proto/SwerveDriveKinematicsProto.h b/wpimath/src/main/native/include/frc/kinematics/proto/SwerveDriveKinematicsProto.h index 9d1e63c61dc..b84343459d9 100644 --- a/wpimath/src/main/native/include/frc/kinematics/proto/SwerveDriveKinematicsProto.h +++ b/wpimath/src/main/native/include/frc/kinematics/proto/SwerveDriveKinematicsProto.h @@ -4,13 +4,12 @@ #pragma once -#include #include #include "frc/kinematics/SwerveDriveKinematics.h" template -struct WPILIB_DLLEXPORT wpi::Protobuf> { +struct wpi::Protobuf> { static google::protobuf::Message* New(google::protobuf::Arena* arena); static frc::SwerveDriveKinematics Unpack( const google::protobuf::Message& msg); diff --git a/wpimath/src/main/native/include/frc/proto/MatrixProto.h b/wpimath/src/main/native/include/frc/proto/MatrixProto.h index 5fbe5d68ea3..1440c513c6e 100644 --- a/wpimath/src/main/native/include/frc/proto/MatrixProto.h +++ b/wpimath/src/main/native/include/frc/proto/MatrixProto.h @@ -4,15 +4,13 @@ #pragma once -#include #include #include "frc/EigenCore.h" template requires(Cols != 1) -struct WPILIB_DLLEXPORT - wpi::Protobuf> { +struct wpi::Protobuf> { static google::protobuf::Message* New(google::protobuf::Arena* arena); static frc::Matrixd Unpack( const google::protobuf::Message& msg); diff --git a/wpimath/src/main/native/include/frc/proto/VectorProto.h b/wpimath/src/main/native/include/frc/proto/VectorProto.h index 25c54b4e540..654f31c0882 100644 --- a/wpimath/src/main/native/include/frc/proto/VectorProto.h +++ b/wpimath/src/main/native/include/frc/proto/VectorProto.h @@ -4,14 +4,12 @@ #pragma once -#include #include #include "frc/EigenCore.h" template -struct WPILIB_DLLEXPORT - wpi::Protobuf> { +struct wpi::Protobuf> { static google::protobuf::Message* New(google::protobuf::Arena* arena); static frc::Matrixd Unpack( const google::protobuf::Message& msg); diff --git a/wpimath/src/main/native/include/frc/system/proto/LinearSystemProto.h b/wpimath/src/main/native/include/frc/system/proto/LinearSystemProto.h index 1fae248ef99..6d5452fc72a 100644 --- a/wpimath/src/main/native/include/frc/system/proto/LinearSystemProto.h +++ b/wpimath/src/main/native/include/frc/system/proto/LinearSystemProto.h @@ -4,15 +4,13 @@ #pragma once -#include #include #include "frc/proto/MatrixProto.h" #include "frc/system/LinearSystem.h" template -struct WPILIB_DLLEXPORT - wpi::Protobuf> { +struct wpi::Protobuf> { static google::protobuf::Message* New(google::protobuf::Arena* arena); static frc::LinearSystem Unpack( const google::protobuf::Message& msg);