commit 6d5d9ae8a55f4fa5b1d5392c647d101a3923af11
author Austin Schuh <austin@peloton-tech.com> Sat Oct 31 19:39:57 2015 -0700
committer Austin Schuh <austin@peloton-tech.com> Sun Nov 01 11:49:44 2015 -0800
tree 0f8ff411290ee2e7e357ddf7de638552a66bac09
parent 3b5b69b4d3e91bca280c284aa312896a2f06e8be

Handled WPILib stupidly #defineing ERROR and get everything building.

Change-Id: Ie49be384cd4b2e2e9d26314a014eb21e158a6979

y2014/wpilib/wpilib_interface.cc

diff --git a/y2014/wpilib/wpilib_interface.cc b/y2014/wpilib/wpilib_interface.cc
index 1e70fb2..3977300 100644
--- a/y2014/wpilib/wpilib_interface.cc
+++ b/y2014/wpilib/wpilib_interface.cc
@@ -7,6 +7,20 @@
 #include <mutex>
 #include <functional>
 
+#include "Encoder.h"
+#include "Talon.h"
+#include "DriverStation.h"
+#include "AnalogInput.h"
+#include "Compressor.h"
+#include "Relay.h"
+#include "RobotBase.h"
+#include "dma.h"
+#include "ControllerPower.h"
+#ifndef WPILIB2015
+#include "DigitalGlitchFilter.h"
+#endif
+#undef ERROR
+
 #include "aos/common/logging/logging.h"
 #include "aos/common/logging/queue_logging.h"
 #include "aos/common/time.h"
@@ -35,16 +49,6 @@
 #include "frc971/wpilib/encoder_and_potentiometer.h"
 #include "frc971/wpilib/logging.q.h"
 
-#include "Encoder.h"
-#include "Talon.h"
-#include "DriverStation.h"
-#include "AnalogInput.h"
-#include "Compressor.h"
-#include "Relay.h"
-#include "RobotBase.h"
-#include "dma.h"
-#include "ControllerPower.h"
-
 #ifndef M_PI
 #define M_PI 3.14159265358979323846
 #endif