From b219d19153a7d04ad7b02e3c3f45da084e6e5389 Mon Sep 17 00:00:00 2001 From: thomasclark Date: Thu, 29 May 2014 18:11:01 -0400 Subject: [PATCH] Fixed several files to use .hpp headers Change-Id: I2a9ed167c18188b32a746e65dc3b08853b371dc4 --- hal/include/HAL/HAL.hpp | 1 + hal/lib/Athena/Solenoid.cpp | 1 - wpilibj/wpilibJavaJNI/lib/CompressorJNI.cpp | 4 ++-- wpilibj/wpilibJavaJNI/lib/SolenoidJNI.cpp | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hal/include/HAL/HAL.hpp b/hal/include/HAL/HAL.hpp index 697d7a3887..53179bfa07 100644 --- a/hal/include/HAL/HAL.hpp +++ b/hal/include/HAL/HAL.hpp @@ -19,6 +19,7 @@ #include "Notifier.hpp" #include "Interrupts.hpp" #include "Errors.hpp" +#include "PDP.hpp" #include "Utilities.hpp" #include "Semaphore.hpp" diff --git a/hal/lib/Athena/Solenoid.cpp b/hal/lib/Athena/Solenoid.cpp index eddcc92958..bc6a4a1458 100644 --- a/hal/lib/Athena/Solenoid.cpp +++ b/hal/lib/Athena/Solenoid.cpp @@ -7,7 +7,6 @@ #include "HAL/cpp/Synchronized.hpp" #include "NetworkCommunication/LoadOut.h" #include "ctre/PCM.h" -#include bool pcmModulesInitialized = false; diff --git a/wpilibj/wpilibJavaJNI/lib/CompressorJNI.cpp b/wpilibj/wpilibJavaJNI/lib/CompressorJNI.cpp index e84602bcce..a3d9761372 100644 --- a/wpilibj/wpilibJavaJNI/lib/CompressorJNI.cpp +++ b/wpilibj/wpilibJavaJNI/lib/CompressorJNI.cpp @@ -1,6 +1,6 @@ -#include "Log.h" +#include "Log.hpp" #include "edu_wpi_first_wpilibj_hal_CompressorJNI.h" -#include "HAL/HAL.h" +#include "HAL/HAL.hpp" typedef void *VoidPointer; diff --git a/wpilibj/wpilibJavaJNI/lib/SolenoidJNI.cpp b/wpilibj/wpilibJavaJNI/lib/SolenoidJNI.cpp index 8789b36854..21469a9c7b 100644 --- a/wpilibj/wpilibJavaJNI/lib/SolenoidJNI.cpp +++ b/wpilibj/wpilibJavaJNI/lib/SolenoidJNI.cpp @@ -1,6 +1,6 @@ #include -#include "Log.h" -#include "HAL/HAL.h" +#include "Log.hpp" +#include "HAL/HAL.hpp" #include "edu_wpi_first_wpilibj_hal_SolenoidJNI.h"