commit 3b5b69b4d3e91bca280c284aa312896a2f06e8be
author Austin Schuh <austin@peloton-tech.com> Sat Oct 31 18:55:47 2015 -0700
committer Austin Schuh <austin@peloton-tech.com> Sat Oct 31 18:55:47 2015 -0700
tree f3270974fe38141893b5980f90e5246ff776d3d7
parent 397b5fb76793d9d07f426da2336cdfa9e8960592

Used new WPILIB2015 macro to mark differences with the old WPILib.

Change-Id: I9e45a22096bdb108f74f9dc341037d5f64506ff5

frc971/wpilib/buffered_pcm.h

diff --git a/frc971/wpilib/buffered_pcm.h b/frc971/wpilib/buffered_pcm.h
index 50f86fc..e2613d7 100644
--- a/frc971/wpilib/buffered_pcm.h
+++ b/frc971/wpilib/buffered_pcm.h
@@ -29,7 +29,9 @@
 
  private:
   // WPILib declares this pure virtual and then never calls it...
+#ifdef WPILIB2015
   virtual void InitSolenoid() override {}
+#endif
 
   void Set(int number, bool value);
 

frc971/wpilib/joystick_sender.cc

diff --git a/frc971/wpilib/joystick_sender.cc b/frc971/wpilib/joystick_sender.cc
index 236cc0f..4942eaa 100644
--- a/frc971/wpilib/joystick_sender.cc
+++ b/frc971/wpilib/joystick_sender.cc
@@ -12,7 +12,12 @@
 namespace wpilib {
 
 void JoystickSender::operator()() {
-  DriverStation *ds = DriverStation::GetInstance();
+  DriverStation *ds =
+#ifdef WPILIB2015
+      DriverStation::GetInstance();
+#else
+      &DriverStation::GetInstance();
+#endif
   ::aos::SetCurrentThreadName("DSReader");
   uint16_t team_id = ::aos::network::GetTeamNumber();