From 2e7df213ba3367bb2fda5d4cc4fc2f69195dbb8c Mon Sep 17 00:00:00 2001 From: Shawn Chain Date: Sun, 1 Nov 2020 19:26:53 +0800 Subject: [PATCH] Fix unused-private-field warnings --- DMRControl.cpp | 3 +++ Defines.h | 2 ++ NullModem.h | 2 +- P25Control.cpp | 1 + 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/DMRControl.cpp b/DMRControl.cpp index bd07082..812436e 100644 --- a/DMRControl.cpp +++ b/DMRControl.cpp @@ -35,6 +35,9 @@ m_lookup(lookup) assert(lookup != NULL); assert(rssi != NULL); + (UNUSED)m_colorCode; + (UNUSED)m_modem; + // Load black and white lists to DMRAccessControl CDMRAccessControl::init(blacklist, whitelist, slot1TGWhitelist, slot2TGWhitelist, selfOnly, prefixes, id); diff --git a/Defines.h b/Defines.h index 18c103e..919a68e 100644 --- a/Defines.h +++ b/Defines.h @@ -81,4 +81,6 @@ enum DMR_OVCM_TYPES { DMR_OVCM_ON }; +typedef void UNUSED; + #endif diff --git a/NullModem.h b/NullModem.h index b6bd80f..413757a 100644 --- a/NullModem.h +++ b/NullModem.h @@ -76,7 +76,7 @@ public: virtual bool writeDStarInfo(const char* my1, const char* my2, const char* your, const char* type, const char* reflector){return true;}; virtual bool writeDMRInfo(unsigned int slotNo, const std::string& src, bool group, const std::string& dst, const char* type){return true;}; - virtual bool writeYSFInfo(const char* source, const char* dest, const char* type, const char* origin){return true;}; + virtual bool writeYSFInfo(const char* source, const char* dest, unsigned char dgid, const char* type, const char* origin){return true;}; virtual bool writeP25Info(const char* source, bool group, unsigned int dest, const char* type){return true;}; virtual bool writeNXDNInfo(const char* source, bool group, unsigned int dest, const char* type){return true;}; virtual bool writePOCSAGInfo(unsigned int ric, const std::string& message){return true;}; diff --git a/P25Control.cpp b/P25Control.cpp index b9825f0..a798bc4 100644 --- a/P25Control.cpp +++ b/P25Control.cpp @@ -86,6 +86,7 @@ m_fp(NULL) assert(display != NULL); assert(lookup != NULL); assert(rssiMapper != NULL); + (UNUSED)m_nac; m_netLDU1 = new unsigned char[9U * 25U]; m_netLDU2 = new unsigned char[9U * 25U];