Changeset 74197 in vbox for trunk/include/iprt/cpp

Timestamp:

Sep 11, 2018 2:49:55 PM (7 years ago)

Author:

vboxsync

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

124973

Message:

IPRT/rest: String map tests. A couple of bugfixes (removal, enumeration). bugref:9167

File:

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

trunk/include/iprt/cpp/reststringmap.h

@@ -83 +83 @@
      * @param   a_pszKey   The key to check fo.
      */
-    bool constainsKey(const char *a_pszKey) const;
+    bool containsKey(const char *a_pszKey) const;
 
     /**
@@ -90 +90 @@
      * @param   a_rStrKey   The key to check fo.
      */
-    bool constainsKey(RTCString const &a_rStrKey) const;
+    bool containsKey(RTCString const &a_rStrKey) const;
 
     /**
@@ -193 +193 @@
 
     /** Returns iterator for the first map entry (unless it's empty and it's also the end). */
-    inline ConstIterator begin() const { return ConstIterator(RTListGetFirstCpp(&m_ListHead, MapEntry, ListEntry)); }
+    inline ConstIterator begin() const
+    {
+        if (!RTListIsEmpty(&m_ListHead))
+            return ConstIterator(RTListNodeGetNextCpp(&m_ListHead, MapEntry, ListEntry));
+        return end();
+    }
     /** Returns iterator for the last map entry (unless it's empty and it's also the end). */
-    inline ConstIterator last() const  { return ConstIterator(RTListGetLastCpp(&m_ListHead, MapEntry, ListEntry)); }
+    inline ConstIterator last() const
+    {
+        if (!RTListIsEmpty(&m_ListHead))
+            return ConstIterator(RTListNodeGetPrevCpp(&m_ListHead, MapEntry, ListEntry));
+        return end();
+    }
     /** Returns the end iterator.  This does not ever refer to an actual map entry. */
-    inline ConstIterator end() const   { return ConstIterator(RT_FROM_CPP_MEMBER(&m_ListHead, MapEntry, ListEntry)); }
+    inline ConstIterator end() const
+    {
+        return ConstIterator(RT_FROM_CPP_MEMBER(&m_ListHead, MapEntry, ListEntry));
+    }
     /** @} */