From 9cf1fd46c8c19b94af1c3a9a85f577142f3e281f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Fri, 14 Mar 2014 07:49:56 +1100 Subject: [PATCH] AP_GPS: removed nav_setting default not needed, and apparently caused issue with xcode 5.1 --- libraries/AP_GPS/AP_GPS_406.h | 2 +- libraries/AP_GPS/AP_GPS_Auto.h | 2 +- libraries/AP_GPS/AP_GPS_HIL.h | 2 +- libraries/AP_GPS/AP_GPS_MTK.h | 2 +- libraries/AP_GPS/AP_GPS_MTK19.h | 2 +- libraries/AP_GPS/AP_GPS_NMEA.h | 2 +- libraries/AP_GPS/AP_GPS_None.h | 2 +- libraries/AP_GPS/AP_GPS_SIRF.h | 2 +- libraries/AP_GPS/AP_GPS_UBLOX.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/libraries/AP_GPS/AP_GPS_406.h b/libraries/AP_GPS/AP_GPS_406.h index 4186fab396..862a993b0d 100644 --- a/libraries/AP_GPS/AP_GPS_406.h +++ b/libraries/AP_GPS/AP_GPS_406.h @@ -34,7 +34,7 @@ public: AP_GPS_406() : AP_GPS_SIRF() {} // Methods - virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting = GPS_ENGINE_NONE); + virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting); private: void _change_to_sirf_protocol(void); diff --git a/libraries/AP_GPS/AP_GPS_Auto.h b/libraries/AP_GPS/AP_GPS_Auto.h index 007980838e..821d6c042b 100644 --- a/libraries/AP_GPS/AP_GPS_Auto.h +++ b/libraries/AP_GPS/AP_GPS_Auto.h @@ -24,7 +24,7 @@ public: AP_GPS_Auto(GPS **gps); /// Dummy init routine, does nothing - virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting = GPS_ENGINE_NONE); + virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting); /// Detect and initialise the attached GPS unit. Updates the /// pointer passed into the constructor when a GPS is detected. diff --git a/libraries/AP_GPS/AP_GPS_HIL.h b/libraries/AP_GPS/AP_GPS_HIL.h index 08386c00b4..ccf66d1525 100644 --- a/libraries/AP_GPS/AP_GPS_HIL.h +++ b/libraries/AP_GPS/AP_GPS_HIL.h @@ -32,7 +32,7 @@ public: _updated(false) {} - virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting = GPS_ENGINE_NONE); + virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting); virtual bool read(void); /** diff --git a/libraries/AP_GPS/AP_GPS_MTK.h b/libraries/AP_GPS/AP_GPS_MTK.h index d184910de2..5c5c4ce19c 100644 --- a/libraries/AP_GPS/AP_GPS_MTK.h +++ b/libraries/AP_GPS/AP_GPS_MTK.h @@ -37,7 +37,7 @@ public: _payload_counter(0) {} - virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting = GPS_ENGINE_NONE); + virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting); virtual bool read(void); static bool _detect(uint8_t ); diff --git a/libraries/AP_GPS/AP_GPS_MTK19.h b/libraries/AP_GPS/AP_GPS_MTK19.h index 17b35873be..42ee8cf266 100644 --- a/libraries/AP_GPS/AP_GPS_MTK19.h +++ b/libraries/AP_GPS/AP_GPS_MTK19.h @@ -41,7 +41,7 @@ public: _fix_counter(0) {} - virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting = GPS_ENGINE_NONE); + virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting); virtual bool read(void); static bool _detect(uint8_t ); diff --git a/libraries/AP_GPS/AP_GPS_NMEA.h b/libraries/AP_GPS/AP_GPS_NMEA.h index 1c02fc6990..2e2355fad6 100644 --- a/libraries/AP_GPS/AP_GPS_NMEA.h +++ b/libraries/AP_GPS/AP_GPS_NMEA.h @@ -70,7 +70,7 @@ public: /// Perform a (re)initialisation of the GPS; sends the /// protocol configuration messages. /// - virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting = GPS_ENGINE_NONE); + virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting); /// Checks the serial receive buffer for characters, /// attempts to parse NMEA data and updates internal state diff --git a/libraries/AP_GPS/AP_GPS_None.h b/libraries/AP_GPS/AP_GPS_None.h index 978c0294d3..5a66c8b847 100644 --- a/libraries/AP_GPS/AP_GPS_None.h +++ b/libraries/AP_GPS/AP_GPS_None.h @@ -11,7 +11,7 @@ class AP_GPS_None : public GPS public: AP_GPS_None() : GPS() {} - virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting = GPS_ENGINE_NONE) { + virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting) { _port = s; }; virtual bool read(void) { diff --git a/libraries/AP_GPS/AP_GPS_SIRF.h b/libraries/AP_GPS/AP_GPS_SIRF.h index 8c0b3a9c5c..af5cf492f6 100644 --- a/libraries/AP_GPS/AP_GPS_SIRF.h +++ b/libraries/AP_GPS/AP_GPS_SIRF.h @@ -38,7 +38,7 @@ public: _msg_id(0) {} - virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting = GPS_ENGINE_NONE); + virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting); virtual bool read(); static bool _detect(uint8_t data); diff --git a/libraries/AP_GPS/AP_GPS_UBLOX.h b/libraries/AP_GPS/AP_GPS_UBLOX.h index 13a698b5b1..4e11df9a07 100644 --- a/libraries/AP_GPS/AP_GPS_UBLOX.h +++ b/libraries/AP_GPS/AP_GPS_UBLOX.h @@ -57,7 +57,7 @@ public: {} // Methods - virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting = GPS_ENGINE_NONE); + virtual void init(AP_HAL::UARTDriver *s, enum GPS_Engine_Setting nav_setting); virtual bool read(); static bool _detect(uint8_t );