Mirror
/
ardupilot
mirror of https://github.com/ArduPilot/ardupilot
5
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

AP_GPS: unify singleton naming to _singleton and get_singleton()

This commit is contained in:
Tom Pittenger 2019-02-10 10:31:20 -08:00 committed by Tom Pittenger
parent 818c828a4a
commit 5d66c3ed62
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_GPS/AP_GPS.cpp
View File

@ -561,7 +561,7 @@ AP_GPS::GPS_Status AP_GPS::highest_supported_status(uint8_t instance) const
bool AP_GPS::should_df_log() const bool AP_GPS::should_df_log() const
{ {
AP_Logger *instance = AP_Logger::instance(); AP_Logger *instance = AP_Logger::get_singleton();
if (instance == nullptr) { if (instance == nullptr) {
return false; return false;
} }
@ -1546,7 +1546,7 @@ namespace AP {
AP_GPS &gps() AP_GPS &gps()
{ {
return AP_GPS::gps(); return AP_GPS::get_singleton();
} }
}; };

2
libraries/AP_GPS/AP_GPS.h
View File

@ -71,7 +71,7 @@ public:
AP_GPS(const AP_GPS &other) = delete; AP_GPS(const AP_GPS &other) = delete;
AP_GPS &operator=(const AP_GPS&) = delete; AP_GPS &operator=(const AP_GPS&) = delete;
static AP_GPS &gps() { static AP_GPS &get_singleton() {
return *_singleton; return *_singleton;
} }