From a00b2449db01679f553f07e67e3605a3660aa1b8 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Thu, 23 Nov 2017 20:46:24 -0800
Subject: [PATCH] Removed unused includes and replaced Ultrasonic's std::set
 with std::vector (#767)

---
 wpilibc/src/main/native/cpp/Ultrasonic.cpp           | 7 ++++---
 wpilibc/src/main/native/include/Commands/Scheduler.h | 2 --
 wpilibc/src/main/native/include/Ultrasonic.h         | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/wpilibc/src/main/native/cpp/Ultrasonic.cpp b/wpilibc/src/main/native/cpp/Ultrasonic.cpp
index 72d84071b0..9ef0dbec98 100644
--- a/wpilibc/src/main/native/cpp/Ultrasonic.cpp
+++ b/wpilibc/src/main/native/cpp/Ultrasonic.cpp
@@ -22,7 +22,7 @@ using namespace frc;
 // Automatic round robin mode
 std::atomic<bool> Ultrasonic::m_automaticEnabled{false};
 
-std::set<Ultrasonic*> Ultrasonic::m_sensors;
+std::vector<Ultrasonic*> Ultrasonic::m_sensors;
 std::thread Ultrasonic::m_thread;
 
 /**
@@ -61,7 +61,7 @@ void Ultrasonic::Initialize() {
   bool originalMode = m_automaticEnabled;
   SetAutomaticMode(false);  // Kill task when adding a new sensor
   // Link this instance on the list
-  m_sensors.insert(this);
+  m_sensors.emplace_back(this);
 
   m_counter.SetMaxPeriod(1.0);
   m_counter.SetSemiPeriodMode(true);
@@ -172,7 +172,8 @@ Ultrasonic::~Ultrasonic() {
   SetAutomaticMode(false);
 
   // No synchronization needed because the background task is stopped.
-  m_sensors.erase(this);
+  m_sensors.erase(std::remove(m_sensors.begin(), m_sensors.end(), this),
+                  m_sensors.end());
 
   if (!m_sensors.empty() && wasAutomaticMode) {
     SetAutomaticMode(true);
diff --git a/wpilibc/src/main/native/include/Commands/Scheduler.h b/wpilibc/src/main/native/include/Commands/Scheduler.h
index 2c494cf5ed..68f3354cbd 100644
--- a/wpilibc/src/main/native/include/Commands/Scheduler.h
+++ b/wpilibc/src/main/native/include/Commands/Scheduler.h
@@ -7,8 +7,6 @@
 
 #pragma once
 
-#include <list>
-#include <map>
 #include <memory>
 #include <set>
 #include <string>
diff --git a/wpilibc/src/main/native/include/Ultrasonic.h b/wpilibc/src/main/native/include/Ultrasonic.h
index 8e1ee1c86f..7772ae3bd5 100644
--- a/wpilibc/src/main/native/include/Ultrasonic.h
+++ b/wpilibc/src/main/native/include/Ultrasonic.h
@@ -9,9 +9,9 @@
 
 #include <atomic>
 #include <memory>
-#include <set>
 #include <string>
 #include <thread>
+#include <vector>
 
 #include "Counter.h"
 #include "LiveWindow/LiveWindowSendable.h"
@@ -90,7 +90,7 @@ class Ultrasonic : public SensorBase,
   static std::thread m_thread;
 
   // Ultrasonic sensors
-  static std::set<Ultrasonic*> m_sensors;
+  static std::vector<Ultrasonic*> m_sensors;
 
   // Automatic round-robin mode
   static std::atomic<bool> m_automaticEnabled;