From f9d810ac2a02ef96c843e214c7479146dd4f4157 Mon Sep 17 00:00:00 2001
From: Nat Goodspeed <nat@lindenlab.com>
Date: Tue, 21 Jun 2022 17:24:03 -0400
Subject: [PATCH] DRTVWR-564: Per NickyD, need not test static_cast result for
nullptr.
---
indra/llcommon/lleventdispatcher.cpp | 7 -------
indra/llcommon/lleventdispatcher.h | 10 +---------
2 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/indra/llcommon/lleventdispatcher.cpp b/indra/llcommon/lleventdispatcher.cpp
index bc53ec3da03..7ba8c5ada74 100644
--- a/indra/llcommon/lleventdispatcher.cpp
+++ b/indra/llcommon/lleventdispatcher.cpp
@@ -586,13 +586,6 @@ void LLEventDispatcher::add(const std::string& name, const std::string& desc,
new LLSDDispatchEntry(desc, callable, required))));
}
-void LLEventDispatcher::addFail(const std::string& name, const std::string& classname) const
-{
- LL_ERRS("LLEventDispatcher") << "LLEventDispatcher(" << mDesc << ")::add(" << name
- << "): " << classname << " is not a subclass "
- << "of LLEventDispatcher" << LL_ENDL;
-}
-
/// Unregister a callable
bool LLEventDispatcher::remove(const std::string& name)
{
diff --git a/indra/llcommon/lleventdispatcher.h b/indra/llcommon/lleventdispatcher.h
index 2e140329f3a..6d1df86fead 100644
--- a/indra/llcommon/lleventdispatcher.h
+++ b/indra/llcommon/lleventdispatcher.h
@@ -330,16 +330,8 @@ class LL_COMMON_API LLEventDispatcher
const METHOD& method, const LLSD& required)
{
CLASS* downcast = static_cast<CLASS*>(this);
- if (! downcast)
- {
- addFail(name, typeid(CLASS).name());
- }
- else
- {
- add(name, desc, boost::bind(method, downcast, _1), required);
- }
+ add(name, desc, boost::bind(method, downcast, _1), required);
}
- void addFail(const std::string& name, const std::string& classname) const;
std::string try_call_log(const std::string& key, const std::string& name,
const LLSD& event) const;
std::string try_call(const std::string& key, const std::string& name,
--
GitLab