Start switching to tuples

PeterJohnson · Dec 24, 2023 · 6c5d2a4 · 6c5d2a4
1 parent 8803de5
commit 6c5d2a4
Show file tree

Hide file tree

Showing 6 changed files with 244 additions and 164 deletions.
diff --git a/ntcore/src/main/native/include/networktables/NetworkTableInstance.h b/ntcore/src/main/native/include/networktables/NetworkTableInstance.h
@@ -262,11 +262,13 @@ class NetworkTableInstance 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;
+  StructTopic<T, I...> GetStructTopic(std::string_view name,
+                                      const I&... info) const;
 
   /**
    * Gets a raw struct serialized array topic.

diff --git a/ntcore/src/main/native/include/networktables/NetworkTableInstance.inc b/ntcore/src/main/native/include/networktables/NetworkTableInstance.inc
@@ -47,8 +47,8 @@ inline ProtobufTopic<T> NetworkTableInstance::GetProtobufTopic(
 template <typename T, typename... I>
   requires wpi::StructSerializable<T, I...>
 inline StructTopic<T, I...> NetworkTableInstance::GetStructTopic(
-    std::string_view name) const {
-  return StructTopic<T, I...>{GetTopic(name)};
+    std::string_view name, const I&... info) const {
+  return StructTopic<T, I...>{GetTopic(name), info...};
 }
 
 template <typename T, typename... I>