build: disable `-Wnon-virtual-dtor` compiler warning
It's overkill and suffers from annoying false positives that
prevent us from applying the "protected non-virtual destructor"
idiom in several perfectly valid cases. See for instance the
GCC bug https://gcc.gnu.org/bugzilla/show_bug.cgi?id=102168
The -Wdelete-non-virtual-dtor warning (included in -Wall) is
the preferred alternative and is enough to catch the unsafe
cases without false positives.
Partially reverts 847de408cbb2358bbb664d971cc33e73b0b2ef7f
Change-Id: I46ee1f01e7d4e2b125c2c534c6550824ba1de4c0
diff --git a/daemon/fw/retx-suppression-exponential.hpp b/daemon/fw/retx-suppression-exponential.hpp
index 82dec6c..6935bfd 100644
--- a/daemon/fw/retx-suppression-exponential.hpp
+++ b/daemon/fw/retx-suppression-exponential.hpp
@@ -1,6 +1,6 @@
/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
/*
- * Copyright (c) 2014-2022, Regents of the University of California,
+ * Copyright (c) 2014-2023, Regents of the University of California,
* Arizona Board of Regents,
* Colorado State University,
* University Pierre & Marie Curie, Sorbonne University,
@@ -51,19 +51,22 @@
Duration maxInterval = DEFAULT_MAX_INTERVAL,
float multiplier = DEFAULT_MULTIPLIER);
- /** \brief Determines whether Interest is a retransmission per pit entry
- * and if so, whether it shall be forwarded or suppressed.
+ /**
+ * \brief Determines whether Interest is a retransmission per PIT entry
+ * and if so, whether it shall be forwarded or suppressed.
*/
RetxSuppressionResult
decidePerPitEntry(pit::Entry& pitEntry);
- /** \brief Determines whether Interest is a retransmission per upstream
- * and if so, whether it shall be forwarded or suppressed.
+ /**
+ * \brief Determines whether Interest is a retransmission per upstream
+ * and if so, whether it shall be forwarded or suppressed.
*/
RetxSuppressionResult
decidePerUpstream(pit::Entry& pitEntry, Face& outFace);
- /** \brief Increment the suppression interval for out record.
+ /**
+ * \brief Increment the suppression interval for an out-record.
*/
void
incrementIntervalForOutRecord(pit::OutRecord& outRecord);
@@ -75,8 +78,8 @@
friend std::ostream&
operator<<(std::ostream& os, const RetxSuppressionExponential& retxSupp)
{
- return os << "RetxSuppressionExponential initial-interval=" << retxSupp.m_initialInterval
- << " max-interval=" << retxSupp.m_maxInterval
+ return os << "RetxSuppressionExponential initial-interval=" << retxSupp.m_initialInterval.count()
+ << " max-interval=" << retxSupp.m_maxInterval.count()
<< " multiplier=" << retxSupp.m_multiplier;
}