From 6fc16264ce84610dde6ad744e88202a17d7e7e67 Mon Sep 17 00:00:00 2001
From: Dustin Spicuzza <dustin@virtualroadside.com>
Date: Sun, 21 Jan 2024 13:57:11 -0500
Subject: [PATCH] [ntcore] NetworkTable: Actually use the I parameter for
 structs (#6280)

---
 .../main/native/include/networktables/NetworkTable.h  | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/ntcore/src/main/native/include/networktables/NetworkTable.h b/ntcore/src/main/native/include/networktables/NetworkTable.h
index 1d93c8c738..1008859171 100644
--- a/ntcore/src/main/native/include/networktables/NetworkTable.h
+++ b/ntcore/src/main/native/include/networktables/NetworkTable.h
@@ -246,24 +246,27 @@ class NetworkTable final {
    * Gets a raw struct serialized value topic.
    *
    * @param name topic name
+   * @param info optional struct type info
    * @return Topic
    */
   template <typename T, typename... I>
     requires wpi::StructSerializable<T, I...>
-  StructTopic<T, I...> GetStructTopic(std::string_view name) const {
-    return StructTopic<T, I...>{GetTopic(name)};
+  StructTopic<T, I...> GetStructTopic(std::string_view name, I... info) const {
+    return StructTopic<T, I...>{GetTopic(name), std::move(info)...};
   }
 
   /**
    * Gets a raw struct serialized array topic.
    *
    * @param name topic name
+   * @param info optional struct type info
    * @return Topic
    */
   template <typename T, typename... I>
     requires wpi::StructSerializable<T, I...>
-  StructArrayTopic<T, I...> GetStructArrayTopic(std::string_view name) const {
-    return StructArrayTopic<T, I...>{GetTopic(name)};
+  StructArrayTopic<T, I...> GetStructArrayTopic(std::string_view name,
+                                                I... info) const {
+    return StructArrayTopic<T, I...>{GetTopic(name), std::move(info)...};
   }
 
   /**