diff --git a/.ycm_extra_conf.py b/.ycm_extra_conf.py
index c38095aa..d86ca885 100644
--- a/.ycm_extra_conf.py
+++ b/.ycm_extra_conf.py
@@ -9,8 +9,6 @@ BASE_FLAGS = [
'-Wall',
'-Wextra',
'-Werror',
- '-Wno-long-long',
- '-Wno-variadic-macros',
'-fexceptions',
'-ferror-limit=10000',
'-DASIO_STANDALONE',
diff --git a/src/common/dmr/lc/csbk/CSBK_ACK_RSP.h b/src/common/dmr/lc/csbk/CSBK_ACK_RSP.h
index a3ddba83..266c69db 100644
--- a/src/common/dmr/lc/csbk/CSBK_ACK_RSP.h
+++ b/src/common/dmr/lc/csbk/CSBK_ACK_RSP.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_ACK_RSP();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_ALOHA.h b/src/common/dmr/lc/csbk/CSBK_ALOHA.h
index ae343d18..66e2d00a 100644
--- a/src/common/dmr/lc/csbk/CSBK_ALOHA.h
+++ b/src/common/dmr/lc/csbk/CSBK_ALOHA.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_ALOHA();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_BROADCAST.h b/src/common/dmr/lc/csbk/CSBK_BROADCAST.h
index 0cb54c07..37a72b3a 100644
--- a/src/common/dmr/lc/csbk/CSBK_BROADCAST.h
+++ b/src/common/dmr/lc/csbk/CSBK_BROADCAST.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_BROADCAST();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_BSDWNACT.h b/src/common/dmr/lc/csbk/CSBK_BSDWNACT.h
index 8bdb8db8..8ea8599f 100644
--- a/src/common/dmr/lc/csbk/CSBK_BSDWNACT.h
+++ b/src/common/dmr/lc/csbk/CSBK_BSDWNACT.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_BSDWNACT();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_CALL_ALRT.h b/src/common/dmr/lc/csbk/CSBK_CALL_ALRT.h
index ea030e77..6872a54e 100644
--- a/src/common/dmr/lc/csbk/CSBK_CALL_ALRT.h
+++ b/src/common/dmr/lc/csbk/CSBK_CALL_ALRT.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_CALL_ALRT();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_EXT_FNCT.h b/src/common/dmr/lc/csbk/CSBK_EXT_FNCT.h
index 64238281..86e3f881 100644
--- a/src/common/dmr/lc/csbk/CSBK_EXT_FNCT.h
+++ b/src/common/dmr/lc/csbk/CSBK_EXT_FNCT.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_EXT_FNCT();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_MAINT.h b/src/common/dmr/lc/csbk/CSBK_MAINT.h
index 4c01e86f..70633840 100644
--- a/src/common/dmr/lc/csbk/CSBK_MAINT.h
+++ b/src/common/dmr/lc/csbk/CSBK_MAINT.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_MAINT();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_NACK_RSP.h b/src/common/dmr/lc/csbk/CSBK_NACK_RSP.h
index b1c0ecb0..41c00b73 100644
--- a/src/common/dmr/lc/csbk/CSBK_NACK_RSP.h
+++ b/src/common/dmr/lc/csbk/CSBK_NACK_RSP.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_NACK_RSP();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_PD_GRANT.h b/src/common/dmr/lc/csbk/CSBK_PD_GRANT.h
index 5e6ec600..cc727386 100644
--- a/src/common/dmr/lc/csbk/CSBK_PD_GRANT.h
+++ b/src/common/dmr/lc/csbk/CSBK_PD_GRANT.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_PD_GRANT();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_PRECCSBK.h b/src/common/dmr/lc/csbk/CSBK_PRECCSBK.h
index a278dba8..92e85aa5 100644
--- a/src/common/dmr/lc/csbk/CSBK_PRECCSBK.h
+++ b/src/common/dmr/lc/csbk/CSBK_PRECCSBK.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_PRECCSBK();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_PV_GRANT.h b/src/common/dmr/lc/csbk/CSBK_PV_GRANT.h
index 84f7d51c..b8f75094 100644
--- a/src/common/dmr/lc/csbk/CSBK_PV_GRANT.h
+++ b/src/common/dmr/lc/csbk/CSBK_PV_GRANT.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_PV_GRANT();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_P_CLEAR.h b/src/common/dmr/lc/csbk/CSBK_P_CLEAR.h
index e5bc9f87..a57fc081 100644
--- a/src/common/dmr/lc/csbk/CSBK_P_CLEAR.h
+++ b/src/common/dmr/lc/csbk/CSBK_P_CLEAR.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_P_CLEAR();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_P_GRANT.h b/src/common/dmr/lc/csbk/CSBK_P_GRANT.h
index 6919a2aa..aa8bfb0b 100644
--- a/src/common/dmr/lc/csbk/CSBK_P_GRANT.h
+++ b/src/common/dmr/lc/csbk/CSBK_P_GRANT.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_P_GRANT();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_RAND.h b/src/common/dmr/lc/csbk/CSBK_RAND.h
index e199d690..b28b7684 100644
--- a/src/common/dmr/lc/csbk/CSBK_RAND.h
+++ b/src/common/dmr/lc/csbk/CSBK_RAND.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_RAND();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_RAW.h b/src/common/dmr/lc/csbk/CSBK_RAW.h
index b0658c25..e6fe22e1 100644
--- a/src/common/dmr/lc/csbk/CSBK_RAW.h
+++ b/src/common/dmr/lc/csbk/CSBK_RAW.h
@@ -48,9 +48,9 @@ namespace dmr
~CSBK_RAW();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Sets the CSBK to encode.
void setCSBK(const uint8_t* csbk);
diff --git a/src/common/dmr/lc/csbk/CSBK_TD_GRANT.h b/src/common/dmr/lc/csbk/CSBK_TD_GRANT.h
index 2e597aeb..a837c888 100644
--- a/src/common/dmr/lc/csbk/CSBK_TD_GRANT.h
+++ b/src/common/dmr/lc/csbk/CSBK_TD_GRANT.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_TD_GRANT();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_TV_GRANT.h b/src/common/dmr/lc/csbk/CSBK_TV_GRANT.h
index 0f053183..9ba5b4f4 100644
--- a/src/common/dmr/lc/csbk/CSBK_TV_GRANT.h
+++ b/src/common/dmr/lc/csbk/CSBK_TV_GRANT.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_TV_GRANT();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_UU_ANS_RSP.h b/src/common/dmr/lc/csbk/CSBK_UU_ANS_RSP.h
index 0d0b3395..34dbbef5 100644
--- a/src/common/dmr/lc/csbk/CSBK_UU_ANS_RSP.h
+++ b/src/common/dmr/lc/csbk/CSBK_UU_ANS_RSP.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_UU_ANS_RSP();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/dmr/lc/csbk/CSBK_UU_V_REQ.h b/src/common/dmr/lc/csbk/CSBK_UU_V_REQ.h
index 517e4fc1..6417cda4 100644
--- a/src/common/dmr/lc/csbk/CSBK_UU_V_REQ.h
+++ b/src/common/dmr/lc/csbk/CSBK_UU_V_REQ.h
@@ -46,9 +46,9 @@ namespace dmr
CSBK_UU_V_REQ();
/// Decode a control signalling block.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a control signalling block.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
/// Returns a string that represents the current CSBK.
virtual std::string toString() override;
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h
index 41569967..f027ec92 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DCALL_HDR.h
@@ -46,9 +46,9 @@ namespace nxdn
MESSAGE_TYPE_DCALL_HDR();
/// Decode layer 3 data.
- void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Encode layer 3 data.
- void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Returns a string that represents the current RCCH.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h
index ff371616..6a12b3f0 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_DST_ID_INFO.h
@@ -46,9 +46,9 @@ namespace nxdn
MESSAGE_TYPE_DST_ID_INFO();
/// Decode layer 3 data.
- void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Encode layer 3 data.
- void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Returns a string that represents the current RCCH.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h
index 5f7c2bf2..748c3c0d 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_GRP_REG.h
@@ -47,9 +47,9 @@ namespace nxdn
MESSAGE_TYPE_GRP_REG();
/// Decode layer 3 data.
- void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Encode layer 3 data.
- void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Returns a string that represents the current RCCH.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h
index 671f8359..a1cf1773 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_IDLE.h
@@ -46,9 +46,9 @@ namespace nxdn
MESSAGE_TYPE_IDLE();
/// Decode layer 3 data.
- void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Encode layer 3 data.
- void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Returns a string that represents the current RCCH.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG.h
index f19abbd6..5b896fd8 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG.h
@@ -47,9 +47,9 @@ namespace nxdn
MESSAGE_TYPE_REG();
/// Decode layer 3 data.
- void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Encode layer 3 data.
- void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Returns a string that represents the current RCCH.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h
index 336119a7..9285afd0 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_C.h
@@ -47,9 +47,9 @@ namespace nxdn
MESSAGE_TYPE_REG_C();
/// Decode layer 3 data.
- void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Encode layer 3 data.
- void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Returns a string that represents the current RCCH.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h
index 2b09138b..6d93c6df 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_REG_COMM.h
@@ -46,9 +46,9 @@ namespace nxdn
MESSAGE_TYPE_REG_COMM();
/// Decode layer 3 data.
- void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Encode layer 3 data.
- void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Returns a string that represents the current RCCH.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h
index d33e81ae..9fbaff97 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SITE_INFO.h
@@ -46,9 +46,9 @@ namespace nxdn
MESSAGE_TYPE_SITE_INFO();
/// Decode layer 3 data.
- void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Encode layer 3 data.
- void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Returns a string that represents the current RCCH.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h
index 3c9c30b7..a970417c 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_SRV_INFO.h
@@ -46,9 +46,9 @@ namespace nxdn
MESSAGE_TYPE_SRV_INFO();
/// Decode layer 3 data.
- void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Encode layer 3 data.
- void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Returns a string that represents the current RCCH.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h
index 651df75e..446dfe15 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_ASSGN.h
@@ -46,9 +46,9 @@ namespace nxdn
MESSAGE_TYPE_VCALL_ASSGN();
/// Decode layer 3 data.
- void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Encode layer 3 data.
- void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Returns a string that represents the current RCCH.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h
index 2c7bf8c1..a1887588 100644
--- a/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h
+++ b/src/common/nxdn/lc/rcch/MESSAGE_TYPE_VCALL_CONN.h
@@ -47,9 +47,9 @@ namespace nxdn
MESSAGE_TYPE_VCALL_CONN();
/// Decode layer 3 data.
- void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void decode(const uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Encode layer 3 data.
- void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U);
+ void encode(uint8_t* data, uint32_t length, uint32_t offset = 0U) override;
/// Returns a string that represents the current RCCH.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tdulc/LC_ADJ_STS_BCAST.h b/src/common/p25/lc/tdulc/LC_ADJ_STS_BCAST.h
index 46a446c3..166b7e91 100644
--- a/src/common/p25/lc/tdulc/LC_ADJ_STS_BCAST.h
+++ b/src/common/p25/lc/tdulc/LC_ADJ_STS_BCAST.h
@@ -46,9 +46,9 @@ namespace p25
LC_ADJ_STS_BCAST();
/// Decode a terminator data unit w/ link control.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a terminator data unit w/ link control.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
public:
/// Adjacent site CFVA flags.
diff --git a/src/common/p25/lc/tdulc/LC_CALL_TERM.h b/src/common/p25/lc/tdulc/LC_CALL_TERM.h
index 1eef898b..9e58ee4b 100644
--- a/src/common/p25/lc/tdulc/LC_CALL_TERM.h
+++ b/src/common/p25/lc/tdulc/LC_CALL_TERM.h
@@ -46,9 +46,9 @@ namespace p25
LC_CALL_TERM();
/// Decode a terminator data unit w/ link control.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a terminator data unit w/ link control.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
};
} // namespace tdulc
} // namespace lc
diff --git a/src/common/p25/lc/tdulc/LC_CONV_FALLBACK.h b/src/common/p25/lc/tdulc/LC_CONV_FALLBACK.h
index cd2f875a..44b83fed 100644
--- a/src/common/p25/lc/tdulc/LC_CONV_FALLBACK.h
+++ b/src/common/p25/lc/tdulc/LC_CONV_FALLBACK.h
@@ -46,9 +46,9 @@ namespace p25
LC_CONV_FALLBACK();
/// Decode a terminator data unit w/ link control.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a terminator data unit w/ link control.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
};
} // namespace tdulc
} // namespace lc
diff --git a/src/common/p25/lc/tdulc/LC_FAILSOFT.h b/src/common/p25/lc/tdulc/LC_FAILSOFT.h
index be1cebe8..3f036458 100644
--- a/src/common/p25/lc/tdulc/LC_FAILSOFT.h
+++ b/src/common/p25/lc/tdulc/LC_FAILSOFT.h
@@ -46,9 +46,9 @@ namespace p25
LC_FAILSOFT();
/// Decode a terminator data unit w/ link control.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a terminator data unit w/ link control.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
};
} // namespace tdulc
} // namespace lc
diff --git a/src/common/p25/lc/tdulc/LC_GROUP.h b/src/common/p25/lc/tdulc/LC_GROUP.h
index 08022e2c..3a4bfc9a 100644
--- a/src/common/p25/lc/tdulc/LC_GROUP.h
+++ b/src/common/p25/lc/tdulc/LC_GROUP.h
@@ -46,9 +46,9 @@ namespace p25
LC_GROUP();
/// Decode a terminator data unit w/ link control.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a terminator data unit w/ link control.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
};
} // namespace tdulc
} // namespace lc
diff --git a/src/common/p25/lc/tdulc/LC_GROUP_UPDT.h b/src/common/p25/lc/tdulc/LC_GROUP_UPDT.h
index ea7c649c..5c648081 100644
--- a/src/common/p25/lc/tdulc/LC_GROUP_UPDT.h
+++ b/src/common/p25/lc/tdulc/LC_GROUP_UPDT.h
@@ -46,9 +46,9 @@ namespace p25
LC_GROUP_UPDT();
/// Decode a terminator data unit w/ link control.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a terminator data unit w/ link control.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
};
} // namespace tdulc
} // namespace lc
diff --git a/src/common/p25/lc/tdulc/LC_IDEN_UP.h b/src/common/p25/lc/tdulc/LC_IDEN_UP.h
index c0d0b494..973eca52 100644
--- a/src/common/p25/lc/tdulc/LC_IDEN_UP.h
+++ b/src/common/p25/lc/tdulc/LC_IDEN_UP.h
@@ -46,9 +46,9 @@ namespace p25
LC_IDEN_UP();
/// Decode a terminator data unit w/ link control.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a terminator data unit w/ link control.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
};
} // namespace tdulc
} // namespace lc
diff --git a/src/common/p25/lc/tdulc/LC_NET_STS_BCAST.h b/src/common/p25/lc/tdulc/LC_NET_STS_BCAST.h
index bcc3c306..e30a7cc9 100644
--- a/src/common/p25/lc/tdulc/LC_NET_STS_BCAST.h
+++ b/src/common/p25/lc/tdulc/LC_NET_STS_BCAST.h
@@ -46,9 +46,9 @@ namespace p25
LC_NET_STS_BCAST();
/// Decode a terminator data unit w/ link control.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a terminator data unit w/ link control.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
};
} // namespace tdulc
} // namespace lc
diff --git a/src/common/p25/lc/tdulc/LC_PRIVATE.h b/src/common/p25/lc/tdulc/LC_PRIVATE.h
index 697cb3a3..83f72ceb 100644
--- a/src/common/p25/lc/tdulc/LC_PRIVATE.h
+++ b/src/common/p25/lc/tdulc/LC_PRIVATE.h
@@ -46,9 +46,9 @@ namespace p25
LC_PRIVATE();
/// Decode a terminator data unit w/ link control.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a terminator data unit w/ link control.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
};
} // namespace tdulc
} // namespace lc
diff --git a/src/common/p25/lc/tdulc/LC_RFSS_STS_BCAST.h b/src/common/p25/lc/tdulc/LC_RFSS_STS_BCAST.h
index 3aa14579..486c1035 100644
--- a/src/common/p25/lc/tdulc/LC_RFSS_STS_BCAST.h
+++ b/src/common/p25/lc/tdulc/LC_RFSS_STS_BCAST.h
@@ -46,9 +46,9 @@ namespace p25
LC_RFSS_STS_BCAST();
/// Decode a terminator data unit w/ link control.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a terminator data unit w/ link control.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
};
} // namespace tdulc
} // namespace lc
diff --git a/src/common/p25/lc/tdulc/LC_SYS_SRV_BCAST.h b/src/common/p25/lc/tdulc/LC_SYS_SRV_BCAST.h
index 9b7c9761..66d0b187 100644
--- a/src/common/p25/lc/tdulc/LC_SYS_SRV_BCAST.h
+++ b/src/common/p25/lc/tdulc/LC_SYS_SRV_BCAST.h
@@ -46,9 +46,9 @@ namespace p25
LC_SYS_SRV_BCAST();
/// Decode a terminator data unit w/ link control.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a terminator data unit w/ link control.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
};
} // namespace tdulc
} // namespace lc
diff --git a/src/common/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h b/src/common/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h
index 65a26445..dc7e5109 100644
--- a/src/common/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h
+++ b/src/common/p25/lc/tdulc/LC_TEL_INT_VCH_USER.h
@@ -46,9 +46,9 @@ namespace p25
LC_TEL_INT_VCH_USER();
/// Decode a terminator data unit w/ link control.
- bool decode(const uint8_t* data);
+ bool decode(const uint8_t* data) override;
/// Encode a terminator data unit w/ link control.
- void encode(uint8_t* data);
+ void encode(uint8_t* data) override;
};
} // namespace tdulc
} // namespace lc
diff --git a/src/common/p25/lc/tsbk/IOSP_ACK_RSP.h b/src/common/p25/lc/tsbk/IOSP_ACK_RSP.h
index 45c32b9a..d2e568c6 100644
--- a/src/common/p25/lc/tsbk/IOSP_ACK_RSP.h
+++ b/src/common/p25/lc/tsbk/IOSP_ACK_RSP.h
@@ -47,9 +47,9 @@ namespace p25
IOSP_ACK_RSP();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/IOSP_CALL_ALRT.h b/src/common/p25/lc/tsbk/IOSP_CALL_ALRT.h
index 58844ff0..890e919b 100644
--- a/src/common/p25/lc/tsbk/IOSP_CALL_ALRT.h
+++ b/src/common/p25/lc/tsbk/IOSP_CALL_ALRT.h
@@ -47,9 +47,9 @@ namespace p25
IOSP_CALL_ALRT();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/IOSP_EXT_FNCT.h b/src/common/p25/lc/tsbk/IOSP_EXT_FNCT.h
index acfc72b1..ad7bcbbb 100644
--- a/src/common/p25/lc/tsbk/IOSP_EXT_FNCT.h
+++ b/src/common/p25/lc/tsbk/IOSP_EXT_FNCT.h
@@ -47,9 +47,9 @@ namespace p25
IOSP_EXT_FNCT();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/IOSP_GRP_AFF.h b/src/common/p25/lc/tsbk/IOSP_GRP_AFF.h
index e0e4fe2e..c79adad2 100644
--- a/src/common/p25/lc/tsbk/IOSP_GRP_AFF.h
+++ b/src/common/p25/lc/tsbk/IOSP_GRP_AFF.h
@@ -47,9 +47,9 @@ namespace p25
IOSP_GRP_AFF();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/IOSP_GRP_VCH.h b/src/common/p25/lc/tsbk/IOSP_GRP_VCH.h
index 7775b4cd..106ad5e3 100644
--- a/src/common/p25/lc/tsbk/IOSP_GRP_VCH.h
+++ b/src/common/p25/lc/tsbk/IOSP_GRP_VCH.h
@@ -47,9 +47,9 @@ namespace p25
IOSP_GRP_VCH();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/IOSP_MSG_UPDT.h b/src/common/p25/lc/tsbk/IOSP_MSG_UPDT.h
index 507387e9..f93bd0bd 100644
--- a/src/common/p25/lc/tsbk/IOSP_MSG_UPDT.h
+++ b/src/common/p25/lc/tsbk/IOSP_MSG_UPDT.h
@@ -47,9 +47,9 @@ namespace p25
IOSP_MSG_UPDT();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/IOSP_RAD_MON.h b/src/common/p25/lc/tsbk/IOSP_RAD_MON.h
index 8b65cbb3..2a636a42 100644
--- a/src/common/p25/lc/tsbk/IOSP_RAD_MON.h
+++ b/src/common/p25/lc/tsbk/IOSP_RAD_MON.h
@@ -48,9 +48,9 @@ namespace p25
IOSP_RAD_MON();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/IOSP_STS_UPDT.h b/src/common/p25/lc/tsbk/IOSP_STS_UPDT.h
index 03474c05..c6d0e9e8 100644
--- a/src/common/p25/lc/tsbk/IOSP_STS_UPDT.h
+++ b/src/common/p25/lc/tsbk/IOSP_STS_UPDT.h
@@ -47,9 +47,9 @@ namespace p25
IOSP_STS_UPDT();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/IOSP_UU_ANS.h b/src/common/p25/lc/tsbk/IOSP_UU_ANS.h
index bcf901f9..c41e187e 100644
--- a/src/common/p25/lc/tsbk/IOSP_UU_ANS.h
+++ b/src/common/p25/lc/tsbk/IOSP_UU_ANS.h
@@ -50,9 +50,9 @@ namespace p25
IOSP_UU_ANS& operator=(const IOSP_UU_ANS& data);
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/IOSP_UU_VCH.h b/src/common/p25/lc/tsbk/IOSP_UU_VCH.h
index 005ba86d..78b7fbce 100644
--- a/src/common/p25/lc/tsbk/IOSP_UU_VCH.h
+++ b/src/common/p25/lc/tsbk/IOSP_UU_VCH.h
@@ -47,9 +47,9 @@ namespace p25
IOSP_UU_VCH();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/IOSP_U_REG.h b/src/common/p25/lc/tsbk/IOSP_U_REG.h
index 305c1efd..9b40c678 100644
--- a/src/common/p25/lc/tsbk/IOSP_U_REG.h
+++ b/src/common/p25/lc/tsbk/IOSP_U_REG.h
@@ -47,9 +47,9 @@ namespace p25
IOSP_U_REG();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/ISP_AUTH_FNE_RST.h b/src/common/p25/lc/tsbk/ISP_AUTH_FNE_RST.h
index 496ffb03..9364f27b 100644
--- a/src/common/p25/lc/tsbk/ISP_AUTH_FNE_RST.h
+++ b/src/common/p25/lc/tsbk/ISP_AUTH_FNE_RST.h
@@ -46,9 +46,9 @@ namespace p25
ISP_AUTH_FNE_RST();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/ISP_AUTH_RESP.h b/src/common/p25/lc/tsbk/ISP_AUTH_RESP.h
index 4adbdd8a..16bb5701 100644
--- a/src/common/p25/lc/tsbk/ISP_AUTH_RESP.h
+++ b/src/common/p25/lc/tsbk/ISP_AUTH_RESP.h
@@ -48,9 +48,9 @@ namespace p25
~ISP_AUTH_RESP();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/ISP_AUTH_SU_DMD.h b/src/common/p25/lc/tsbk/ISP_AUTH_SU_DMD.h
index cf3abbdd..46eca410 100644
--- a/src/common/p25/lc/tsbk/ISP_AUTH_SU_DMD.h
+++ b/src/common/p25/lc/tsbk/ISP_AUTH_SU_DMD.h
@@ -46,9 +46,9 @@ namespace p25
ISP_AUTH_SU_DMD();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/ISP_CAN_SRV_REQ.h b/src/common/p25/lc/tsbk/ISP_CAN_SRV_REQ.h
index 8760729d..983c9c81 100644
--- a/src/common/p25/lc/tsbk/ISP_CAN_SRV_REQ.h
+++ b/src/common/p25/lc/tsbk/ISP_CAN_SRV_REQ.h
@@ -46,9 +46,9 @@ namespace p25
ISP_CAN_SRV_REQ();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h b/src/common/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h
index 4144a5c3..311a768f 100644
--- a/src/common/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h
+++ b/src/common/p25/lc/tsbk/ISP_EMERG_ALRM_REQ.h
@@ -46,9 +46,9 @@ namespace p25
ISP_EMERG_ALRM_REQ();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h b/src/common/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h
index 76a0cc14..8c7a55c6 100644
--- a/src/common/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h
+++ b/src/common/p25/lc/tsbk/ISP_GRP_AFF_Q_RSP.h
@@ -46,9 +46,9 @@ namespace p25
ISP_GRP_AFF_Q_RSP();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/ISP_LOC_REG_REQ.h b/src/common/p25/lc/tsbk/ISP_LOC_REG_REQ.h
index fe24c2f4..1aa82a1e 100644
--- a/src/common/p25/lc/tsbk/ISP_LOC_REG_REQ.h
+++ b/src/common/p25/lc/tsbk/ISP_LOC_REG_REQ.h
@@ -46,9 +46,9 @@ namespace p25
ISP_LOC_REG_REQ();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h b/src/common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h
index fc26cfa5..e0de60a5 100644
--- a/src/common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h
+++ b/src/common/p25/lc/tsbk/ISP_SNDCP_CH_REQ.h
@@ -46,9 +46,9 @@ namespace p25
ISP_SNDCP_CH_REQ();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/ISP_U_DEREG_REQ.h b/src/common/p25/lc/tsbk/ISP_U_DEREG_REQ.h
index a982023f..e84aec07 100644
--- a/src/common/p25/lc/tsbk/ISP_U_DEREG_REQ.h
+++ b/src/common/p25/lc/tsbk/ISP_U_DEREG_REQ.h
@@ -46,9 +46,9 @@ namespace p25
ISP_U_DEREG_REQ();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h b/src/common/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h
index 3c80071e..7be4c038 100644
--- a/src/common/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h
+++ b/src/common/p25/lc/tsbk/OSP_ADJ_STS_BCAST.h
@@ -46,9 +46,9 @@ namespace p25
OSP_ADJ_STS_BCAST();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h b/src/common/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h
index 4045127c..5fcb70c6 100644
--- a/src/common/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h
+++ b/src/common/p25/lc/tsbk/OSP_AUTH_FNE_RESP.h
@@ -48,9 +48,9 @@ namespace p25
~OSP_AUTH_FNE_RESP();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_DENY_RSP.h b/src/common/p25/lc/tsbk/OSP_DENY_RSP.h
index 016368a0..69f03675 100644
--- a/src/common/p25/lc/tsbk/OSP_DENY_RSP.h
+++ b/src/common/p25/lc/tsbk/OSP_DENY_RSP.h
@@ -46,9 +46,9 @@ namespace p25
OSP_DENY_RSP();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h b/src/common/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h
index 69e3eb99..ff300346 100644
--- a/src/common/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h
+++ b/src/common/p25/lc/tsbk/OSP_DVM_LC_CALL_TERM.h
@@ -46,9 +46,9 @@ namespace p25
OSP_DVM_LC_CALL_TERM();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_GRP_AFF_Q.h b/src/common/p25/lc/tsbk/OSP_GRP_AFF_Q.h
index 7874f84f..c9e94cc8 100644
--- a/src/common/p25/lc/tsbk/OSP_GRP_AFF_Q.h
+++ b/src/common/p25/lc/tsbk/OSP_GRP_AFF_Q.h
@@ -46,9 +46,9 @@ namespace p25
OSP_GRP_AFF_Q();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h b/src/common/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h
index 59ce0999..8243be71 100644
--- a/src/common/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h
+++ b/src/common/p25/lc/tsbk/OSP_GRP_VCH_GRANT_UPD.h
@@ -46,9 +46,9 @@ namespace p25
OSP_GRP_VCH_GRANT_UPD();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_IDEN_UP.h b/src/common/p25/lc/tsbk/OSP_IDEN_UP.h
index 1fe1375f..b17a350e 100644
--- a/src/common/p25/lc/tsbk/OSP_IDEN_UP.h
+++ b/src/common/p25/lc/tsbk/OSP_IDEN_UP.h
@@ -46,9 +46,9 @@ namespace p25
OSP_IDEN_UP();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_IDEN_UP_VU.h b/src/common/p25/lc/tsbk/OSP_IDEN_UP_VU.h
index c56a17ae..6e077b69 100644
--- a/src/common/p25/lc/tsbk/OSP_IDEN_UP_VU.h
+++ b/src/common/p25/lc/tsbk/OSP_IDEN_UP_VU.h
@@ -46,9 +46,9 @@ namespace p25
OSP_IDEN_UP_VU();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_LOC_REG_RSP.h b/src/common/p25/lc/tsbk/OSP_LOC_REG_RSP.h
index 76f4d8b8..3c015803 100644
--- a/src/common/p25/lc/tsbk/OSP_LOC_REG_RSP.h
+++ b/src/common/p25/lc/tsbk/OSP_LOC_REG_RSP.h
@@ -46,9 +46,9 @@ namespace p25
OSP_LOC_REG_RSP();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_MOT_CC_BSI.h b/src/common/p25/lc/tsbk/OSP_MOT_CC_BSI.h
index 506f237b..94822680 100644
--- a/src/common/p25/lc/tsbk/OSP_MOT_CC_BSI.h
+++ b/src/common/p25/lc/tsbk/OSP_MOT_CC_BSI.h
@@ -46,9 +46,9 @@ namespace p25
OSP_MOT_CC_BSI();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_MOT_GRG_ADD.h b/src/common/p25/lc/tsbk/OSP_MOT_GRG_ADD.h
index d31085c2..60545505 100644
--- a/src/common/p25/lc/tsbk/OSP_MOT_GRG_ADD.h
+++ b/src/common/p25/lc/tsbk/OSP_MOT_GRG_ADD.h
@@ -46,9 +46,9 @@ namespace p25
OSP_MOT_GRG_ADD();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_MOT_GRG_DEL.h b/src/common/p25/lc/tsbk/OSP_MOT_GRG_DEL.h
index b296e5cf..7b27e0dc 100644
--- a/src/common/p25/lc/tsbk/OSP_MOT_GRG_DEL.h
+++ b/src/common/p25/lc/tsbk/OSP_MOT_GRG_DEL.h
@@ -46,9 +46,9 @@ namespace p25
OSP_MOT_GRG_DEL();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h b/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h
index 1edc008b..1ec88c76 100644
--- a/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h
+++ b/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_GRANT.h
@@ -46,9 +46,9 @@ namespace p25
OSP_MOT_GRG_VCH_GRANT();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h b/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h
index b39a470f..7c1bbb78 100644
--- a/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h
+++ b/src/common/p25/lc/tsbk/OSP_MOT_GRG_VCH_UPD.h
@@ -46,9 +46,9 @@ namespace p25
OSP_MOT_GRG_VCH_UPD();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_MOT_PSH_CCH.h b/src/common/p25/lc/tsbk/OSP_MOT_PSH_CCH.h
index 98f04a68..cc904aa5 100644
--- a/src/common/p25/lc/tsbk/OSP_MOT_PSH_CCH.h
+++ b/src/common/p25/lc/tsbk/OSP_MOT_PSH_CCH.h
@@ -46,9 +46,9 @@ namespace p25
OSP_MOT_PSH_CCH();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_NET_STS_BCAST.h b/src/common/p25/lc/tsbk/OSP_NET_STS_BCAST.h
index 29159ee2..b9182356 100644
--- a/src/common/p25/lc/tsbk/OSP_NET_STS_BCAST.h
+++ b/src/common/p25/lc/tsbk/OSP_NET_STS_BCAST.h
@@ -46,9 +46,9 @@ namespace p25
OSP_NET_STS_BCAST();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_QUE_RSP.h b/src/common/p25/lc/tsbk/OSP_QUE_RSP.h
index addd105d..46547761 100644
--- a/src/common/p25/lc/tsbk/OSP_QUE_RSP.h
+++ b/src/common/p25/lc/tsbk/OSP_QUE_RSP.h
@@ -46,9 +46,9 @@ namespace p25
OSP_QUE_RSP();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h b/src/common/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h
index d9becc98..ef984366 100644
--- a/src/common/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h
+++ b/src/common/p25/lc/tsbk/OSP_RFSS_STS_BCAST.h
@@ -46,9 +46,9 @@ namespace p25
OSP_RFSS_STS_BCAST();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_SCCB.h b/src/common/p25/lc/tsbk/OSP_SCCB.h
index 6ef98e2f..475ffe16 100644
--- a/src/common/p25/lc/tsbk/OSP_SCCB.h
+++ b/src/common/p25/lc/tsbk/OSP_SCCB.h
@@ -46,9 +46,9 @@ namespace p25
OSP_SCCB();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_SCCB_EXP.h b/src/common/p25/lc/tsbk/OSP_SCCB_EXP.h
index 1381f126..a99323f0 100644
--- a/src/common/p25/lc/tsbk/OSP_SCCB_EXP.h
+++ b/src/common/p25/lc/tsbk/OSP_SCCB_EXP.h
@@ -46,9 +46,9 @@ namespace p25
OSP_SCCB_EXP();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h
index 395548a4..f46c4568 100644
--- a/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h
+++ b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_ANN.h
@@ -46,9 +46,9 @@ namespace p25
OSP_SNDCP_CH_ANN();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h
index a4e7baad..cb8e2d17 100644
--- a/src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h
+++ b/src/common/p25/lc/tsbk/OSP_SNDCP_CH_GNT.h
@@ -46,9 +46,9 @@ namespace p25
OSP_SNDCP_CH_GNT();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_SYNC_BCAST.h b/src/common/p25/lc/tsbk/OSP_SYNC_BCAST.h
index 264514b1..75d16dc2 100644
--- a/src/common/p25/lc/tsbk/OSP_SYNC_BCAST.h
+++ b/src/common/p25/lc/tsbk/OSP_SYNC_BCAST.h
@@ -46,9 +46,9 @@ namespace p25
OSP_SYNC_BCAST();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h b/src/common/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h
index ea4b7e28..61567c86 100644
--- a/src/common/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h
+++ b/src/common/p25/lc/tsbk/OSP_SYS_SRV_BCAST.h
@@ -46,9 +46,9 @@ namespace p25
OSP_SYS_SRV_BCAST();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_TIME_DATE_ANN.h b/src/common/p25/lc/tsbk/OSP_TIME_DATE_ANN.h
index 434fbfa7..1bc198c0 100644
--- a/src/common/p25/lc/tsbk/OSP_TIME_DATE_ANN.h
+++ b/src/common/p25/lc/tsbk/OSP_TIME_DATE_ANN.h
@@ -46,9 +46,9 @@ namespace p25
OSP_TIME_DATE_ANN();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_TSBK_RAW.h b/src/common/p25/lc/tsbk/OSP_TSBK_RAW.h
index b9038934..e320c299 100644
--- a/src/common/p25/lc/tsbk/OSP_TSBK_RAW.h
+++ b/src/common/p25/lc/tsbk/OSP_TSBK_RAW.h
@@ -48,9 +48,9 @@ namespace p25
~OSP_TSBK_RAW();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Sets the TSBK to encode.
void setTSBK(const uint8_t* tsbk);
diff --git a/src/common/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h b/src/common/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h
index db59008f..c74588f3 100644
--- a/src/common/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h
+++ b/src/common/p25/lc/tsbk/OSP_UU_VCH_GRANT_UPD.h
@@ -46,9 +46,9 @@ namespace p25
OSP_UU_VCH_GRANT_UPD();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_U_DEREG_ACK.h b/src/common/p25/lc/tsbk/OSP_U_DEREG_ACK.h
index 90678a56..0cbec88f 100644
--- a/src/common/p25/lc/tsbk/OSP_U_DEREG_ACK.h
+++ b/src/common/p25/lc/tsbk/OSP_U_DEREG_ACK.h
@@ -46,9 +46,9 @@ namespace p25
OSP_U_DEREG_ACK();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/OSP_U_REG_CMD.h b/src/common/p25/lc/tsbk/OSP_U_REG_CMD.h
index 12d5c0dc..2f3921b8 100644
--- a/src/common/p25/lc/tsbk/OSP_U_REG_CMD.h
+++ b/src/common/p25/lc/tsbk/OSP_U_REG_CMD.h
@@ -46,9 +46,9 @@ namespace p25
OSP_U_REG_CMD();
/// Decode a trunking signalling block.
- bool decode(const uint8_t* data, bool rawTSBK = false);
+ bool decode(const uint8_t* data, bool rawTSBK = false) override;
/// Encode a trunking signalling block.
- void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false);
+ void encode(uint8_t* data, bool rawTSBK = false, bool noTrellis = false) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_ACK_RSP.h b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_ACK_RSP.h
index 00494aa8..1f6c3b89 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_ACK_RSP.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_ACK_RSP.h
@@ -47,9 +47,9 @@ namespace p25
MBT_IOSP_ACK_RSP();
/// Decode a alternate trunking signalling block.
- bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
+ bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks) override;
/// Encode a alternate trunking signalling block.
- void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
+ void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_CALL_ALRT.h b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_CALL_ALRT.h
index 6112954d..675f94ef 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_CALL_ALRT.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_CALL_ALRT.h
@@ -47,9 +47,9 @@ namespace p25
MBT_IOSP_CALL_ALRT();
/// Decode a alternate trunking signalling block.
- bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
+ bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks) override;
/// Encode a alternate trunking signalling block.
- void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
+ void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_EXT_FNCT.h b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_EXT_FNCT.h
index 1a392d4c..7e2c3068 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_EXT_FNCT.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_EXT_FNCT.h
@@ -47,9 +47,9 @@ namespace p25
MBT_IOSP_EXT_FNCT();
/// Decode a alternate trunking signalling block.
- bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
+ bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks) override;
/// Encode a alternate trunking signalling block.
- void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
+ void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_GRP_AFF.h b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_GRP_AFF.h
index 7a44dc54..2dfb3290 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_GRP_AFF.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_GRP_AFF.h
@@ -47,9 +47,9 @@ namespace p25
MBT_IOSP_GRP_AFF();
/// Decode a alternate trunking signalling block.
- bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
+ bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks) override;
/// Encode a alternate trunking signalling block.
- void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
+ void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_MSG_UPDT.h b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_MSG_UPDT.h
index 5abee88c..ce1e3eb8 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_MSG_UPDT.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_MSG_UPDT.h
@@ -47,9 +47,9 @@ namespace p25
MBT_IOSP_MSG_UPDT();
/// Decode a alternate trunking signalling block.
- bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
+ bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks) override;
/// Encode a alternate trunking signalling block.
- void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
+ void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_STS_UPDT.h b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_STS_UPDT.h
index 34b44a5f..48ce22b8 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_IOSP_STS_UPDT.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_IOSP_STS_UPDT.h
@@ -47,9 +47,9 @@ namespace p25
MBT_IOSP_STS_UPDT();
/// Decode a alternate trunking signalling block.
- bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
+ bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks) override;
/// Encode a alternate trunking signalling block.
- void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
+ void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_RESP_M.h b/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_RESP_M.h
index 5d690ba6..1e768f43 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_RESP_M.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_RESP_M.h
@@ -48,9 +48,9 @@ namespace p25
~MBT_ISP_AUTH_RESP_M();
/// Decode a alternate trunking signalling block.
- bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
+ bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks) override;
/// Encode a alternate trunking signalling block.
- void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
+ void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_SU_DMD.h b/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_SU_DMD.h
index 1c2615c2..acae6d52 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_SU_DMD.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_ISP_AUTH_SU_DMD.h
@@ -46,9 +46,9 @@ namespace p25
MBT_ISP_AUTH_SU_DMD();
/// Decode a alternate trunking signalling block.
- bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
+ bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks) override;
/// Encode a alternate trunking signalling block.
- void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
+ void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_ISP_CAN_SRV_REQ.h b/src/common/p25/lc/tsbk/mbt/MBT_ISP_CAN_SRV_REQ.h
index c892f709..0f915ad0 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_ISP_CAN_SRV_REQ.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_ISP_CAN_SRV_REQ.h
@@ -46,9 +46,9 @@ namespace p25
MBT_ISP_CAN_SRV_REQ();
/// Decode a alternate trunking signalling block.
- bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
+ bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks) override;
/// Encode a alternate trunking signalling block.
- void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
+ void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_OSP_ADJ_STS_BCAST.h b/src/common/p25/lc/tsbk/mbt/MBT_OSP_ADJ_STS_BCAST.h
index c85238c4..a21e8932 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_OSP_ADJ_STS_BCAST.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_OSP_ADJ_STS_BCAST.h
@@ -46,9 +46,9 @@ namespace p25
MBT_OSP_ADJ_STS_BCAST();
/// Decode a alternate trunking signalling block.
- bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
+ bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks) override;
/// Encode a alternate trunking signalling block.
- void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
+ void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_OSP_AUTH_DMD.h b/src/common/p25/lc/tsbk/mbt/MBT_OSP_AUTH_DMD.h
index e9b83b7f..cc2f8d22 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_OSP_AUTH_DMD.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_OSP_AUTH_DMD.h
@@ -48,9 +48,9 @@ namespace p25
~MBT_OSP_AUTH_DMD();
/// Decode a alternate trunking signalling block.
- bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
+ bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks) override;
/// Encode a alternate trunking signalling block.
- void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
+ void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_OSP_NET_STS_BCAST.h b/src/common/p25/lc/tsbk/mbt/MBT_OSP_NET_STS_BCAST.h
index 9fccdb92..7b14a118 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_OSP_NET_STS_BCAST.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_OSP_NET_STS_BCAST.h
@@ -46,9 +46,9 @@ namespace p25
MBT_OSP_NET_STS_BCAST();
/// Decode a alternate trunking signalling block.
- bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
+ bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks) override;
/// Encode a alternate trunking signalling block.
- void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
+ void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;
diff --git a/src/common/p25/lc/tsbk/mbt/MBT_OSP_RFSS_STS_BCAST.h b/src/common/p25/lc/tsbk/mbt/MBT_OSP_RFSS_STS_BCAST.h
index 5ae81e43..d0868cab 100644
--- a/src/common/p25/lc/tsbk/mbt/MBT_OSP_RFSS_STS_BCAST.h
+++ b/src/common/p25/lc/tsbk/mbt/MBT_OSP_RFSS_STS_BCAST.h
@@ -46,9 +46,9 @@ namespace p25
MBT_OSP_RFSS_STS_BCAST();
/// Decode a alternate trunking signalling block.
- bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks);
+ bool decodeMBT(const data::DataHeader& dataHeader, const data::DataBlock* blocks) override;
/// Encode a alternate trunking signalling block.
- void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData);
+ void encodeMBT(data::DataHeader& dataHeader, uint8_t* pduUserData) override;
/// Returns a string that represents the current TSBK.
virtual std::string toString(bool isp = false) override;