From f48cfcc70cd4caa0f3ec029c3738e5e24832a801 Mon Sep 17 00:00:00 2001 From: Stefan Saraev Date: Mon, 10 Aug 2020 16:25:51 +0300 Subject: [PATCH] OLED: fix build after f070410f7 and c7fbeecc5 ============================ Display.cpp: In static member function 'static CDisplay* CDisplay::createDisplay(const CConf&, CUMP*, CModem*)': Display.cpp:645:128: error: invalid new-expression of abstract class type 'COLED' 645 | display = new COLED(type, brightness, invert, scroll, rotate, logosaver, conf.getDMRNetworkSlot1(), conf.getDMRNetworkSlot2()); | ^ In file included from Display.cpp:39: OLED.h:40:7: note: because the following virtual functions are pure within 'COLED': 40 | class COLED : public CDisplay | ^~~~~ In file included from Display.cpp:19: Display.h:105:15: note: 'virtual void CDisplay::writeFusionInt(const char*, const char*, unsigned char, const char*, const char*)' 105 | virtual void writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin) = 0; ============================ --- OLED.cpp | 2 +- OLED.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/OLED.cpp b/OLED.cpp index 575eda3..6be9583 100644 --- a/OLED.cpp +++ b/OLED.cpp @@ -434,7 +434,7 @@ void COLED::clearDMRInt(unsigned int slotNo) m_display.display(); } -void COLED::writeFusionInt(const char* source, const char* dest, const char* type, const char* origin) +void COLED::writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin) { m_mode = MODE_YSF; diff --git a/OLED.h b/OLED.h index dec7b41..e11a50a 100644 --- a/OLED.h +++ b/OLED.h @@ -58,7 +58,7 @@ public: virtual void writeDMRInt(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type); virtual void clearDMRInt(unsigned int slotNo); - virtual void writeFusionInt(const char* source, const char* dest, const char* type, const char* origin); + virtual void writeFusionInt(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin); virtual void clearFusionInt(); virtual void writeP25Int(const char* source, bool group, unsigned int dest, const char* type);