security+util: remove overloaded operator!()
Identity, Key, and EventId already provide an operator bool(),
which covers all valid use cases.
Change-Id: I57b11db6997e6f537873f41c6ca1c22140b894c3
diff --git a/src/util/scheduler.cpp b/src/util/scheduler.cpp
index 8e72e78..3170f61 100644
--- a/src/util/scheduler.cpp
+++ b/src/util/scheduler.cpp
@@ -21,6 +21,7 @@
#include "scheduler.hpp"
#include "detail/monotonic-deadline-timer.hpp"
+
#include <boost/scope_exit.hpp>
namespace ndn {
@@ -50,10 +51,9 @@
EventQueue::const_iterator queueIt;
};
-bool
-EventId::operator!() const
+EventId::operator bool() const
{
- return m_info.expired() || m_info.lock()->isExpired;
+ return !m_info.expired() && !m_info.lock()->isExpired;
}
bool