Changeset 97946 in vbox for trunk/include/iprt/nocrt

Timestamp:

Jan 3, 2023 8:53:28 AM (2 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

155037

Message:

IPRT: include/iprt/nocrt/vector: Compilation fix for data(), added a separate clear() function -- Thanks to Martin Fleisz!

Additionally, fixed a compilation issue for reference (operator *) item access on Linux.

File:

• trunk/include/iprt/nocrt/vector (modified) (5 diffs)

trunk/include/iprt/nocrt/vector

@@ -4 +4 @@
 
 /*
- * Copyright (C) 2022 Oracle and/or its affiliates.
+ * Copyright (C) 2023 Oracle and/or its affiliates.
  *
  * This file is part of VirtualBox base platform packages, as
@@ -120 +120 @@
         /** @name Item access
          * @{ */
-        typename reference operator*() const RT_NOEXCEPT
+        reference operator*() const RT_NOEXCEPT
         {
             return *m_pItem;
@@ -229 +229 @@
         ~vector()
         {
-            size_type i = m_cItems;
-            while (i-- > 0)
-            {
-                m_Allocator.destroy(&m_paItems[i]);
-                m_cItems = i;
-            }
-            m_Allocator.deallocate(m_paItems, m_cAllocated);
-            m_paItems    = NULL;
-            m_cAllocated = 0;
-        }
-
+            clear();
+        }
 
         /** @name Iterators
@@ -310 +301 @@
         pointer data() RT_NOEXCEPT
         {
-            return m_paItem;
+            return m_paItems;
         }
 
         const_pointer data() const RT_NOEXCEPT
         {
-            return m_paItem;
+            return m_paItems;
         }
 
@@ -386 +377 @@
                 m_cItems -= 1;
         }
-        /** @} */
-
+
+        void clear() RT_NOEXCEPT
+        {
+            size_type i = m_cItems;
+            while (i-- > 0)
+            {
+                m_Allocator.destroy(&m_paItems[i]);
+                m_cItems = i;
+            }
+            m_Allocator.deallocate(m_paItems, m_cAllocated);
+            m_paItems = NULL;
+            m_cAllocated = 0;
+        }
+        /** @} */
     };