commit bc9a2abe4e1cfc6dd01451f72f27a7fe99863f83
author Austin Schuh <austin.linux@gmail.com> Thu Nov 26 16:20:17 2015 -0800
committer Austin Schuh <austin.linux@gmail.com> Thu Nov 26 16:20:17 2015 -0800
tree 5914fb9a93c28740788c7253a59fb3569ec42a0f
parent c2b7774e944971de75d95a59434b75e4b828d008

Fixed y2014_bot3 building with betatest WPILib.

Change-Id: I3095fc7d771296c8cb226e00ddbf0b7ed2d7c696

y2014_bot3/wpilib/wpilib_interface.cc

diff --git a/y2014_bot3/wpilib/wpilib_interface.cc b/y2014_bot3/wpilib/wpilib_interface.cc
index 089b1ab..4dc421d 100644
--- a/y2014_bot3/wpilib/wpilib_interface.cc
+++ b/y2014_bot3/wpilib/wpilib_interface.cc
@@ -17,6 +17,7 @@
 #include "dma.h"
 #include "ControllerPower.h"
 #include "DigitalInput.h"
+#undef ERROR
 
 #include "aos/common/logging/logging.h"
 #include "aos/common/logging/queue_logging.h"
@@ -81,7 +82,12 @@
     LOG(INFO, "In sensor reader thread\n");
 
     my_pid_ = getpid();
-    ds_ = DriverStation::GetInstance();
+    ds_ =
+#ifdef WPILIB2015
+        DriverStation::GetInstance();
+#else
+        &DriverStation::GetInstance();
+#endif
 
     LOG(INFO, "Things are now started\n");