Fixed include order (#245)

See wpilibsuite/styleguide (#11).
2026-07-05 03:21:42 +00:00 · 2016-09-25 16:50:13 -07:00
parent 107a4cc1e2
commit 5dfae8d6bd
109 changed files with 175 additions and 87 deletions
--- a/wpilibc/shared/include/Buttons/NetworkButton.h
+++ b/wpilibc/shared/include/Buttons/NetworkButton.h
@@ -9,6 +9,7 @@

 #include <memory>
 #include <string>
+
 #include "Buttons/Button.h"

 class NetworkButton : public Button {
--- a/wpilibc/shared/include/Commands/Command.h
+++ b/wpilibc/shared/include/Commands/Command.h
@@ -10,6 +10,7 @@
 #include <memory>
 #include <set>
 #include <string>
+
 #include "ErrorBase.h"
 #include "SmartDashboard/NamedSendable.h"
 #include "tables/ITableListener.h"
--- a/wpilibc/shared/include/Commands/PrintCommand.h
+++ b/wpilibc/shared/include/Commands/PrintCommand.h
@@ -8,6 +8,7 @@
 #pragma once

 #include <string>
+
 #include "Commands/Command.h"

 class PrintCommand : public Command {
--- a/wpilibc/shared/include/Commands/Scheduler.h
+++ b/wpilibc/shared/include/Commands/Scheduler.h
@@ -13,6 +13,7 @@
 #include <set>
 #include <string>
 #include <vector>
+
 #include "Commands/Command.h"
 #include "ErrorBase.h"
 #include "HAL/cpp/priority_mutex.h"
--- a/wpilibc/shared/include/Commands/Subsystem.h
+++ b/wpilibc/shared/include/Commands/Subsystem.h
@@ -9,6 +9,7 @@

 #include <memory>
 #include <string>
+
 #include "ErrorBase.h"
 #include "SmartDashboard/NamedSendable.h"

--- a/wpilibc/shared/include/Error.h
+++ b/wpilibc/shared/include/Error.h
@@ -7,7 +7,12 @@

 #pragma once

+#include <stdint.h>
+
+#include <string>
+
 #include "Base.h"
+#include "llvm/StringRef.h"

 #ifdef _WIN32
 #include <Windows.h>
@@ -15,10 +20,6 @@
 #undef GetMessage
 #endif

-#include <stdint.h>
-#include <string>
-#include "llvm/StringRef.h"
-
 //  Forward declarations
 class ErrorBase;

--- a/wpilibc/shared/include/ErrorBase.h
+++ b/wpilibc/shared/include/ErrorBase.h
@@ -9,7 +9,6 @@

 #include "Base.h"
 #include "Error.h"
-
 #include "HAL/cpp/priority_mutex.h"
 #include "llvm/StringRef.h"

--- a/wpilibc/shared/include/Filters/Filter.h
+++ b/wpilibc/shared/include/Filters/Filter.h
@@ -8,6 +8,7 @@
 #pragma once

 #include <memory>
+
 #include "PIDSource.h"

 /**
--- a/wpilibc/shared/include/Filters/LinearDigitalFilter.h
+++ b/wpilibc/shared/include/Filters/LinearDigitalFilter.h
@@ -10,6 +10,7 @@
 #include <initializer_list>
 #include <memory>
 #include <vector>
+
 #include "CircularBuffer.h"
 #include "Filter.h"

--- a/wpilibc/shared/include/SmartDashboard/NamedSendable.h
+++ b/wpilibc/shared/include/SmartDashboard/NamedSendable.h
@@ -8,6 +8,7 @@
 #pragma once

 #include <string>
+
 #include "SmartDashboard/Sendable.h"

 /**
--- a/wpilibc/shared/include/SmartDashboard/Sendable.h
+++ b/wpilibc/shared/include/SmartDashboard/Sendable.h
@@ -9,6 +9,7 @@

 #include <memory>
 #include <string>
+
 #include "tables/ITable.h"

 class Sendable {
--- a/wpilibc/shared/include/SmartDashboard/SendableChooser.h
+++ b/wpilibc/shared/include/SmartDashboard/SendableChooser.h
@@ -10,6 +10,7 @@
 #include <map>
 #include <memory>
 #include <string>
+
 #include "SmartDashboard/Sendable.h"
 #include "tables/ITable.h"

--- a/wpilibc/shared/include/Task.h
+++ b/wpilibc/shared/include/Task.h
@@ -10,6 +10,7 @@
 #include <iostream>
 #include <string>
 #include <thread>
+
 #include "ErrorBase.h"
 #include "HAL/Task.h"

--- a/wpilibc/shared/include/Utility.h
+++ b/wpilibc/shared/include/Utility.h
@@ -12,6 +12,7 @@
 */

 #include <stdint.h>
+
 #include <string>

 #define wpi_assert(condition) \
--- a/wpilibc/shared/src/Buttons/NetworkButton.cpp
+++ b/wpilibc/shared/src/Buttons/NetworkButton.cpp
@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/

 #include "Buttons/NetworkButton.h"
+
 #include "networktables/NetworkTable.h"

 NetworkButton::NetworkButton(const std::string& tableName,
--- a/wpilibc/shared/src/Buttons/Trigger.cpp
+++ b/wpilibc/shared/src/Buttons/Trigger.cpp
@@ -6,7 +6,6 @@
 /*----------------------------------------------------------------------------*/

 #include "Buttons/Button.h"
-
 #include "Buttons/CancelButtonScheduler.h"
 #include "Buttons/HeldButtonScheduler.h"
 #include "Buttons/PressedButtonScheduler.h"
--- a/wpilibc/shared/src/Commands/Command.cpp
+++ b/wpilibc/shared/src/Commands/Command.cpp
@@ -6,7 +6,9 @@
 /*----------------------------------------------------------------------------*/

 #include "Commands/Command.h"
+
 #include <typeinfo>
+
 #include "Commands/CommandGroup.h"
 #include "Commands/Scheduler.h"
 #include "RobotState.h"
--- a/wpilibc/shared/src/Commands/CommandGroup.cpp
+++ b/wpilibc/shared/src/Commands/CommandGroup.cpp
@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/

 #include "Commands/CommandGroup.h"
+
 #include "WPIErrors.h"

 /**
--- a/wpilibc/shared/src/Commands/PIDCommand.cpp
+++ b/wpilibc/shared/src/Commands/PIDCommand.cpp
@@ -7,7 +7,7 @@

 #include "Commands/PIDCommand.h"

-#include "float.h"
+#include <cfloat>

 PIDCommand::PIDCommand(const std::string& name, double p, double i, double d,
                       double f, double period)
--- a/wpilibc/shared/src/Commands/PIDSubsystem.cpp
+++ b/wpilibc/shared/src/Commands/PIDSubsystem.cpp
@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/

 #include "Commands/PIDSubsystem.h"
+
 #include "PIDController.h"

 /**
--- a/wpilibc/shared/src/Commands/Scheduler.cpp
+++ b/wpilibc/shared/src/Commands/Scheduler.cpp
@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <iostream>
 #include <set>
+
 #include "Buttons/ButtonScheduler.h"
 #include "Commands/Subsystem.h"
 #include "HLUsageReporting.h"
--- a/wpilibc/shared/src/Commands/WaitCommand.cpp
+++ b/wpilibc/shared/src/Commands/WaitCommand.cpp
@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/

 #include "Commands/WaitCommand.h"
+
 #include <sstream>

 WaitCommand::WaitCommand(double timeout)
--- a/wpilibc/shared/src/Commands/WaitForChildren.cpp
+++ b/wpilibc/shared/src/Commands/WaitForChildren.cpp
@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/

 #include "Commands/WaitForChildren.h"
+
 #include "Commands/CommandGroup.h"

 WaitForChildren::WaitForChildren(double timeout)
--- a/wpilibc/shared/src/Commands/WaitUntilCommand.cpp
+++ b/wpilibc/shared/src/Commands/WaitUntilCommand.cpp
@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/

 #include "Commands/WaitUntilCommand.h"
+
 #include "Timer.h"

 /**
--- a/wpilibc/shared/src/GyroBase.cpp
+++ b/wpilibc/shared/src/GyroBase.cpp
@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/

 #include "GyroBase.h"
+
 #include "LiveWindow/LiveWindow.h"
 #include "WPIErrors.h"

--- a/wpilibc/shared/src/LiveWindow/LiveWindow.cpp
+++ b/wpilibc/shared/src/LiveWindow/LiveWindow.cpp
@@ -6,8 +6,10 @@
 /*----------------------------------------------------------------------------*/

 #include "LiveWindow/LiveWindow.h"
+
 #include <algorithm>
 #include <sstream>
+
 #include "networktables/NetworkTable.h"

 /**
--- a/wpilibc/shared/src/LiveWindow/LiveWindowStatusListener.cpp
+++ b/wpilibc/shared/src/LiveWindow/LiveWindowStatusListener.cpp
@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/

 #include "LiveWindow/LiveWindowStatusListener.h"
+
 #include "Commands/Scheduler.h"

 void LiveWindowStatusListener::ValueChanged(ITable* source, llvm::StringRef key,
--- a/wpilibc/shared/src/Resource.cpp
+++ b/wpilibc/shared/src/Resource.cpp
@@ -6,6 +6,7 @@
 /*----------------------------------------------------------------------------*/

 #include "Resource.h"
+
 #include "ErrorBase.h"
 #include "WPIErrors.h"

--- a/wpilibc/shared/src/interfaces/Potentiometer.cpp
+++ b/wpilibc/shared/src/interfaces/Potentiometer.cpp
@@ -5,8 +5,9 @@
 /* the project.                                                               */
 /*----------------------------------------------------------------------------*/

+#include "interfaces/Potentiometer.h"
+
 #include <Utility.h>
-#include <interfaces/Potentiometer.h>

 void Potentiometer::SetPIDSourceType(PIDSourceType pidSource) {
  if (wpi_assert(pidSource == PIDSourceType::kDisplacement)) {