From d58a5e124a2c32f16deb16996116a62524080d70 Mon Sep 17 00:00:00 2001 From: Thad House Date: Mon, 8 Jun 2020 21:28:21 -0700 Subject: [PATCH] [sim] Name DSCommJoystickPacket structure (#2525) This fixes a C++ standards compliance issue that broke the build on Windows. --- .../src/main/native/include/DSCommJoystickPacket.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/simulation/halsim_ds_socket/src/main/native/include/DSCommJoystickPacket.h b/simulation/halsim_ds_socket/src/main/native/include/DSCommJoystickPacket.h index 6f7e0bf714..99851f2bcc 100644 --- a/simulation/halsim_ds_socket/src/main/native/include/DSCommJoystickPacket.h +++ b/simulation/halsim_ds_socket/src/main/native/include/DSCommJoystickPacket.h @@ -1,5 +1,5 @@ /*----------------------------------------------------------------------------*/ -/* Copyright (c) 2018 FIRST. All Rights Reserved. */ +/* Copyright (c) 2018-2020 FIRST. All Rights Reserved. */ /* Open Source Software - may be modified and shared by FRC teams. The code */ /* must be accompanied by the FIRST BSD license file in the root directory of */ /* the project. */ @@ -13,7 +13,7 @@ namespace halsim { -typedef struct { +struct DSCommJoystickPacket { HAL_JoystickAxes axes; HAL_JoystickButtons buttons; HAL_JoystickPOVs povs; @@ -26,6 +26,6 @@ typedef struct { } void ResetTcp() { std::memset(&descriptor, 0, sizeof(descriptor)); } -} DSCommJoystickPacket; +}; } // namespace halsim