Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 14:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Notify: unify singleton naming to _singleton and get_singleton()

Browse Source
This commit is contained in:
Tom Pittenger 2019-02-10 10:04:10 -08:00 committed by Tom Pittenger
parent 8a6a39b590
commit 4ece7fd4f0
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libraries/AP_Notify/AP_Notify.cpp
View File

@ -36,7 +36,7 @@
extern const AP_HAL::HAL& hal;
AP_Notify *AP_Notify::_instance;
AP_Notify *AP_Notify::_singleton;
#define CONFIG_NOTIFY_DEVICES_MAX 6
@ -154,10 +154,10 @@ const AP_Param::GroupInfo AP_Notify::var_info[] = {
AP_Notify::AP_Notify()
{
AP_Param::setup_object_defaults(this, var_info);
if (_instance != nullptr) {
if (_singleton != nullptr) {
AP_HAL::panic("AP_Notify must be singleton");
}
_instance = this;
_singleton = this;
}
// static flags, to allow for direct class update from device drivers

6
libraries/AP_Notify/AP_Notify.h
View File

@ -47,8 +47,8 @@ public:
AP_Notify &operator=(const AP_Notify&) = delete;
// get singleton instance
static AP_Notify *instance(void) {
return _instance;
static AP_Notify *get_singleton(void) {
return _singleton;
}
// Oreo LED Themes
@ -154,7 +154,7 @@ public:
private:
static AP_Notify *_instance;
static AP_Notify *_singleton;
void add_backend_helper(NotifyDevice *backend);