Revert the ASSERTs after the local static fix

rdkcentral · Jan 14, 2025 · 33a09f4 · 33a09f4
1 parent cc2bdf2
commit 33a09f4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 8 deletions.
diff --git a/Source/core/MessageStore.cpp b/Source/core/MessageStore.cpp
@@ -64,13 +64,11 @@ ENUM_CONVERSION_END(Core::Messaging::Metadata::type)
         public:
             void Announce(Core::Messaging::IControl* control)
             {
-                // these asserts have to be changed to something else liek ASSERT_L1 so that the AssertControl doesn't call itself
-                // let's first see if this is what Coverity saw - comment them out for now
-                // ASSERT(control != nullptr);
+                ASSERT(control != nullptr);
 
                 _adminLock.Lock();
 
-                // ASSERT(std::find(_controlList.begin(), _controlList.end(), control) == _controlList.end());
+                ASSERT(std::find(_controlList.begin(), _controlList.end(), control) == _controlList.end());
                 _controlList.push_back(control);
 
                 _adminLock.Unlock();

diff --git a/Source/core/Proxy.h b/Source/core/Proxy.h
@@ -1448,7 +1448,7 @@ POP_WARNING()
 
                     Core::ProxyType<ContainerElement>::template CreateMove(newElement, 0, *this, std::forward<Args>(args)...);
                     _queue.emplace_back(std::move(newElement));
-                    // ASSERT(_queue.back().IsValid() == true);
+                    ASSERT(_queue.back().IsValid() == true);
                 }
             }
             ~ProxyPoolType()

diff --git a/Source/core/Singleton.h b/Source/core/Singleton.h
@@ -133,7 +133,7 @@ namespace Core {
                 g_AdminLock.Unlock();
             }
 
-            // ASSERT(g_TypedSingleton != nullptr);
+            ASSERT(g_TypedSingleton != nullptr);
 
             return *(g_TypedSingleton);
         }
@@ -196,15 +196,15 @@ namespace Core {
                 g_AdminLock.Unlock();
             }
 
-            // ASSERT(g_TypedSingleton != nullptr);
+            ASSERT(g_TypedSingleton != nullptr);
 
             return *(g_TypedSingleton);
         }
         static SINGLETON& GetObject(const TemplateIntToType<false>& /* For compile time diffrentiation */)
         {
             // If the Singleton needs to be constructed with a parameter, the Create() method
             // should have been called prior to the instance..
-            // ASSERT(g_TypedSingleton != nullptr);
+            ASSERT(g_TypedSingleton != nullptr);
 
             return *(g_TypedSingleton);
         }