From b0f6dc199d9abfcacd825988c6c0174d60fce43e Mon Sep 17 00:00:00 2001 From: Peter Johnson Date: Fri, 11 Nov 2022 15:08:05 -0800 Subject: [PATCH] [wpilibc] ShuffleboardComponent.WithProperties: Update type (#4615) ShuffleboardComponentBase::m_properties is now a StringMap. --- .../native/include/frc/shuffleboard/ShuffleboardComponent.h | 3 +-- .../native/include/frc/shuffleboard/ShuffleboardComponent.inc | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/wpilibc/src/main/native/include/frc/shuffleboard/ShuffleboardComponent.h b/wpilibc/src/main/native/include/frc/shuffleboard/ShuffleboardComponent.h index 24f65a37b2..fc15948231 100644 --- a/wpilibc/src/main/native/include/frc/shuffleboard/ShuffleboardComponent.h +++ b/wpilibc/src/main/native/include/frc/shuffleboard/ShuffleboardComponent.h @@ -37,8 +37,7 @@ class ShuffleboardComponent : public ShuffleboardComponentBase { * @param properties the properties for this component * @return this component */ - Derived& WithProperties( - const wpi::StringMap>& properties); + Derived& WithProperties(const wpi::StringMap& properties); /** * Sets the position of this component in the tab. This has no effect if this diff --git a/wpilibc/src/main/native/include/frc/shuffleboard/ShuffleboardComponent.inc b/wpilibc/src/main/native/include/frc/shuffleboard/ShuffleboardComponent.inc index 9750d4ad40..63a4933181 100644 --- a/wpilibc/src/main/native/include/frc/shuffleboard/ShuffleboardComponent.inc +++ b/wpilibc/src/main/native/include/frc/shuffleboard/ShuffleboardComponent.inc @@ -21,7 +21,7 @@ ShuffleboardComponent::ShuffleboardComponent( template Derived& ShuffleboardComponent::WithProperties( - const wpi::StringMap>& properties) { + const wpi::StringMap& properties) { m_properties = properties; m_metadataDirty = true; return *static_cast(this);