From f1478a7c93460a98d0f9aed838e06eea26a05bb3 Mon Sep 17 00:00:00 2001 From: Mike Kinney Date: Wed, 2 Mar 2022 00:00:31 +0000 Subject: [PATCH] remove assert; revert a change that cpplint reported as a warning --- src/mesh/PhoneAPI.h | 2 +- src/mesh/Router.cpp | 2 +- suppressions.txt | 4 ++++ 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mesh/PhoneAPI.h b/src/mesh/PhoneAPI.h index 5a4ca381d..67b52d20a 100644 --- a/src/mesh/PhoneAPI.h +++ b/src/mesh/PhoneAPI.h @@ -58,7 +58,7 @@ class PhoneAPI // Call this when the client drops the connection, resets the state to STATE_SEND_NOTHING // Unregisters our observer. A closed connection **can** be reopened by calling init again. - void close(); + virtual void close(); /** * Handle a ToRadio protobuf diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp index 64e0a4795..918ab0f8a 100644 --- a/src/mesh/Router.cpp +++ b/src/mesh/Router.cpp @@ -276,7 +276,7 @@ bool perhapsDecode(MeshPacket *p) if (p->which_payloadVariant == MeshPacket_decoded_tag) return true; // If packet was already decoded just return - assert(p->which_payloadVariant == MeshPacket_encrypted_tag); + //assert(p->which_payloadVariant == MeshPacket_encrypted_tag); // Try to find a channel that works with this hash for (ChannelIndex chIndex = 0; chIndex < channels.getNumChannels(); chIndex++) { diff --git a/suppressions.txt b/suppressions.txt index cdf858753..42dd40c33 100644 --- a/suppressions.txt +++ b/suppressions.txt @@ -36,3 +36,7 @@ cstyleCast // ignore stuff that is not ours *:.pio/* *:*/libdeps/* + +// these two caused issues +missingOverride +virtualCallInConstructor