| commit | 6d5d9ae8a55f4fa5b1d5392c647d101a3923af11 | [log] [tgz] |
|---|---|---|
| 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 [diff] |
Handled WPILib stupidly #defineing ERROR and get everything building. Change-Id: Ie49be384cd4b2e2e9d26314a014eb21e158a6979
diff --git a/frc971/wpilib/buffered_pcm.h b/frc971/wpilib/buffered_pcm.h index e2613d7..288cdfb 100644 --- a/frc971/wpilib/buffered_pcm.h +++ b/frc971/wpilib/buffered_pcm.h
@@ -4,6 +4,7 @@ #include <memory> #include "SolenoidBase.h" +#undef ERROR #include "frc971/wpilib/buffered_solenoid.h"
diff --git a/frc971/wpilib/gyro_interface.h b/frc971/wpilib/gyro_interface.h index 05b9bff..cd734a9 100644 --- a/frc971/wpilib/gyro_interface.h +++ b/frc971/wpilib/gyro_interface.h
@@ -4,6 +4,7 @@ #include <memory> #include "SPI.h" +#undef ERROR namespace frc971 { namespace wpilib {
diff --git a/frc971/wpilib/hall_effect.h b/frc971/wpilib/hall_effect.h index 407f2b9..d95b717 100644 --- a/frc971/wpilib/hall_effect.h +++ b/frc971/wpilib/hall_effect.h
@@ -2,6 +2,7 @@ #define FRC971_WPILIB_HALL_EFFECT_H_ #include "DigitalInput.h" +#undef ERROR namespace frc971 { namespace wpilib {