Remove LIKELY and UNLIKELY

key4hep · Jul 28, 2023 · b03d604 · b03d604
1 parent e1ef940
commit b03d604
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/k4FWCore/include/k4FWCore/DataHandle.h b/k4FWCore/include/k4FWCore/DataHandle.h
@@ -131,8 +131,8 @@ template <typename T> const T* DataHandle<T>::get() {
   DataObject* dataObjectp = nullptr;
   auto        sc          = m_eds->retrieveObject(DataObjectHandle<DataWrapper<T>>::fullKey().key(), dataObjectp);
 
-  if (LIKELY(sc.isSuccess())) {
-    if (UNLIKELY(!m_isGoodType && !m_isCollection)) {
+  if (sc.isSuccess()) {
+    if (!m_isGoodType && !m_isCollection) {
       // only do this once (if both are false after this, we throw exception)
       m_isGoodType = nullptr != dynamic_cast<DataWrapper<T>*>(dataObjectp);
       if (!m_isGoodType) {
@@ -142,7 +142,7 @@ template <typename T> const T* DataHandle<T>::get() {
         }
       }
     }
-    if (LIKELY(m_isGoodType)) {
+    if (m_isGoodType) {
       return static_cast<DataWrapper<T>*>(dataObjectp)->getData();
     } else if (m_isCollection) {
       // The reader does not know the specific type of the collection. So we need a reinterpret_cast if the handle was