From 78434ad16a4b74e7518837598394c5b58345ae46 Mon Sep 17 00:00:00 2001 From: Benjamin Valentin Date: Fri, 29 Oct 2021 01:21:31 +0200 Subject: [PATCH] fix build with g++ 11 --- libplayercore/message.cc | 2 +- server/drivers/dio/bitlogic/bitlogic.cc | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/libplayercore/message.cc b/libplayercore/message.cc index e1790e64..670da77c 100644 --- a/libplayercore/message.cc +++ b/libplayercore/message.cc @@ -506,7 +506,7 @@ MessageQueue::Push(Message & msg) hdr->type == PLAYER_MSGTYPE_CMD) && this->Length >= this->Maxlen) { // record the fact that we are dropping a message - this->drop_count++; + this->drop_count = 1; this->Unlock(); return(true); } diff --git a/server/drivers/dio/bitlogic/bitlogic.cc b/server/drivers/dio/bitlogic/bitlogic.cc index f07239fe..de755f45 100644 --- a/server/drivers/dio/bitlogic/bitlogic.cc +++ b/server/drivers/dio/bitlogic/bitlogic.cc @@ -108,7 +108,7 @@ class Bitlogic : public Driver bool data_valid[MAX_SLOTS]; int ith; int jth; - uint32_t compute() const throw (const char *); + uint32_t compute() const noexcept(false); }; Bitlogic::Bitlogic(ConfigFile * cf, int section) : Driver(cf, section, true, PLAYER_MSGQUEUE_DEFAULT_MAXLEN) @@ -299,7 +299,7 @@ int Bitlogic::Subscribe(player_devaddr_t addr) return 0; } -uint32_t Bitlogic::compute() const throw (const char *) +uint32_t Bitlogic::compute() const noexcept(false) { uint32_t b; int i;