Changeset 55947 in vbox for trunk/include/iprt

Timestamp:

May 19, 2015 11:41:34 PM (10 years ago)

Author:

vboxsync

Message:

iprt/cpp/list.h: Eliminated RT_UNLIKELY.

File:

• trunk/include/iprt/cpp/list.h (modified) (3 diffs)

trunk/include/iprt/cpp/list.h

@@ -458 +458 @@
     {
         /* Prevent self assignment */
-        if (RT_UNLIKELY(this == &other))
-            return *this;
-
-        other.m_guard.enterRead();
-        m_guard.enterWrite();
-
-        /* Delete all items. */
-        RTCListHelper<T, ITYPE>::eraseRange(m_pArray, 0, m_cElements);
-
-        /* Need we to realloc memory. */
-        if (other.m_cElements != m_cCapacity)
-            resizeArrayNoErase(other.m_cElements);
-        m_cElements = other.m_cElements;
-
-        /* Copy new items. */
-        RTCListHelper<T, ITYPE>::copyTo(m_pArray, other.m_pArray, 0, other.m_cElements);
-
-        m_guard.leaveWrite();
-        other.m_guard.leaveRead();
+        if (RT_LIKELY(this != &other))
+        {
+
+            other.m_guard.enterRead();
+            m_guard.enterWrite();
+
+            /* Delete all items. */
+            RTCListHelper<T, ITYPE>::eraseRange(m_pArray, 0, m_cElements);
+
+            /* Need we to realloc memory. */
+            if (other.m_cElements != m_cCapacity)
+                resizeArrayNoErase(other.m_cElements);
+            m_cElements = other.m_cElements;
+
+            /* Copy new items. */
+            RTCListHelper<T, ITYPE>::copyTo(m_pArray, other.m_pArray, 0, other.m_cElements);
+
+            m_guard.leaveWrite();
+            other.m_guard.leaveRead();
+        }
         return *this;
     }
@@ -635 +636 @@
     {
         m_guard.enterRead();
-        if (RT_UNLIKELY(i >= m_cElements))
-        {
+        if (RT_LIKELY(i < m_cElements))
+        {
+            T res = RTCListHelper<T, ITYPE>::at(m_pArray, i);
             m_guard.leaveRead();
-            return T();
-        }
-        T res = RTCListHelper<T, ITYPE>::at(m_pArray, i);
-        m_guard.leaveRead();
-        return res;
+            return res;
+        }
+        m_guard.leaveRead();
+        return T();
     }
 
@@ -655 +656 @@
     {
         m_guard.enterRead();
-        if (RT_UNLIKELY(i >= m_cElements))
-        {
+        if (RT_LIKELY(i < m_cElements))
+        {
+            T res = RTCListHelper<T, ITYPE>::at(m_pArray, i);
             m_guard.leaveRead();
-            return defaultVal;
-        }
-        T res = RTCListHelper<T, ITYPE>::at(m_pArray, i);
-        m_guard.leaveRead();
-        return res;
+            return res;
+        }
+        m_guard.leaveRead();
+        return defaultVal;
     }