From 751dea32ae38da4bd9fd9516d28289e153c62fd6 Mon Sep 17 00:00:00 2001
From: Peter Johnson <johnson.peter@gmail.com>
Date: Sat, 5 Dec 2020 23:19:15 -0800
Subject: [PATCH] [wpilibc] Try to work around ABI break introduced in #2901
 (#2917)

The change to SendableBuilder to add GetTable() added a virtual function
early in the class definition.  This is an ABI break for vendor libraries.
Attempt to workaround this breakage by moving GetTable() to the end of the
class definition.
---
 .../include/frc/smartdashboard/SendableBuilder.h     | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/wpilibc/src/main/native/include/frc/smartdashboard/SendableBuilder.h b/wpilibc/src/main/native/include/frc/smartdashboard/SendableBuilder.h
index 666d31efaa..a312e4f25e 100644
--- a/wpilibc/src/main/native/include/frc/smartdashboard/SendableBuilder.h
+++ b/wpilibc/src/main/native/include/frc/smartdashboard/SendableBuilder.h
@@ -25,12 +25,6 @@ class SendableBuilder {
  public:
   virtual ~SendableBuilder() = default;
 
-  /**
-   * Get the network table.
-   * @return The network table
-   */
-  virtual std::shared_ptr<nt::NetworkTable> GetTable() = 0;
-
   /**
    * Set the string representation of the named data type that will be used
    * by the smart dashboard for this sendable.
@@ -224,6 +218,12 @@ class SendableBuilder {
       const wpi::Twine& key,
       std::function<wpi::StringRef(wpi::SmallVectorImpl<char>& buf)> getter,
       std::function<void(wpi::StringRef)> setter) = 0;
+
+  /**
+   * Get the network table.
+   * @return The network table
+   */
+  virtual std::shared_ptr<nt::NetworkTable> GetTable() = 0;
 };
 
 }  // namespace frc