Changeset 36532 in vbox for trunk/src/VBox/Runtime

Timestamp:

Apr 4, 2011 2:41:14 PM (14 years ago)

Author:

vboxsync

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

70958

Message:

IPRT-C++: iprt::list -> RTCList; iprt::mtlist -> RTCMTList

Location:

trunk/src/VBox/Runtime

Files:

• common/string/ministring.cpp (modified) (2 diffs)
• testcase/tstIprtList.cpp (modified) (7 diffs)
• testcase/tstIprtMiniString.cpp (modified) (2 diffs)

trunk/src/VBox/Runtime/common/string/ministring.cpp

@@ -327 +327 @@
 }
 
-iprt::list<RTCString, RTCString *>
+RTCList<RTCString, RTCString *>
 RTCString::split(const RTCString &a_rstrSep, SplitMode mode /* = RemoveEmptyParts */)
 {
-    iprt::list<RTCString> strRet;
+    RTCList<RTCString> strRet;
     if (!m_psz)
         return strRet;
@@ -362 +362 @@
 /* static */
 RTCString
-RTCString::join(const iprt::list<RTCString, RTCString*> &a_rList,
-                 const RTCString &a_rstrSep /* = "" */)
+RTCString::join(const RTCList<RTCString, RTCString *> &a_rList,
+                const RTCString &a_rstrSep /* = "" */)
 {
     RTCString strRet;

trunk/src/VBox/Runtime/testcase/tstIprtList.cpp

@@ -1 +1 @@
 /* $Id$ */
 /** @file
- * IPRT Testcase - iprt::list.
+ * IPRT Testcase - RTCList/RTCMTList.
  */
 
@@ -348 +348 @@
 }
 
-/* define iprt::list here to see what happens without MT support ;)
+/* define RTCList here to see what happens without MT support ;)
  * (valgrind is the preferred tool to check). */
-#define MTTESTLISTTYPE iprt::mtlist
+#define MTTESTLISTTYPE RTCMTList
 #define MTTESTTYPE uint32_t
 #define MTTESTITEMS 1000
@@ -421 +421 @@
         /* Make sure there is at least one item in the list. */
         while (pTestList->isEmpty()) {};
-        a = pTestList->at(RTRandU32Ex(0, pTestList->size() - 1));
+        a = pTestList->at(RTRandU32Ex(0, (uint32_t)pTestList->size() - 1));
     }
 
@@ -442 +442 @@
         /* Make sure there is at least one item in the list. */
         while (pTestList->isEmpty()) {};
-        pTestList->replace(RTRandU32Ex(0, pTestList->size() - 1), 0xFF00FF00);
+        pTestList->replace(RTRandU32Ex(0, (uint32_t)pTestList->size() - 1), 0xFF00FF00);
     }
 
@@ -463 +463 @@
         /* Make sure there is at least one item in the list. */
         while (pTestList->isEmpty()) {};
-        pTestList->removeAt(RTRandU32Ex(0, pTestList->size() - 1));
+        pTestList->removeAt(RTRandU32Ex(0, (uint32_t)pTestList->size() - 1));
     }
 
@@ -540 +540 @@
     for (size_t i = 0; i < RT_ELEMENTS(au8TestInts); ++i)
         au8TestInts[i] = (uint8_t)RTRandU32Ex(0, UINT8_MAX);
-    test1<iprt::list,   uint8_t, uint8_t, uint8_t>("ST: Native type", au8TestInts, RT_ELEMENTS(au8TestInts));
-    test1<iprt::mtlist, uint8_t, uint8_t, uint8_t>("MT: Native type", au8TestInts, RT_ELEMENTS(au8TestInts));
+    test1<RTCList,   uint8_t, uint8_t, uint8_t>("ST: Native type", au8TestInts, RT_ELEMENTS(au8TestInts));
+    test1<RTCMTList, uint8_t, uint8_t, uint8_t>("MT: Native type", au8TestInts, RT_ELEMENTS(au8TestInts));
 
     uint16_t au16TestInts[s_cTestCount];
     for (size_t i = 0; i < RT_ELEMENTS(au16TestInts); ++i)
         au16TestInts[i] = (uint16_t)RTRandU32Ex(0, UINT16_MAX);
-    test1<iprt::list,   uint16_t, uint16_t, uint16_t>("ST: Native type", au16TestInts, RT_ELEMENTS(au16TestInts));
-    test1<iprt::mtlist, uint16_t, uint16_t, uint16_t>("MT: Native type", au16TestInts, RT_ELEMENTS(au16TestInts));
+    test1<RTCList,   uint16_t, uint16_t, uint16_t>("ST: Native type", au16TestInts, RT_ELEMENTS(au16TestInts));
+    test1<RTCMTList, uint16_t, uint16_t, uint16_t>("MT: Native type", au16TestInts, RT_ELEMENTS(au16TestInts));
 
     uint32_t au32TestInts[s_cTestCount];
     for (size_t i = 0; i < RT_ELEMENTS(au32TestInts); ++i)
         au32TestInts[i] = RTRandU32();
-    test1<iprt::list,   uint32_t, uint32_t, uint32_t>("ST: Native type", au32TestInts, RT_ELEMENTS(au32TestInts));
-    test1<iprt::mtlist, uint32_t, uint32_t, uint32_t>("MT: Native type", au32TestInts, RT_ELEMENTS(au32TestInts));
+    test1<RTCList,   uint32_t, uint32_t, uint32_t>("ST: Native type", au32TestInts, RT_ELEMENTS(au32TestInts));
+    test1<RTCMTList, uint32_t, uint32_t, uint32_t>("MT: Native type", au32TestInts, RT_ELEMENTS(au32TestInts));
 
     /*
@@ -561 +561 @@
     for (size_t i = 0; i < RT_ELEMENTS(au64TestInts); ++i)
         au64TestInts[i] = RTRandU64();
-    test1<iprt::list,   uint64_t, uint64_t, uint64_t>("ST: Specialized type", au64TestInts, RT_ELEMENTS(au64TestInts));
-    test1<iprt::mtlist, uint64_t, uint64_t, uint64_t>("MT: Specialized type", au64TestInts, RT_ELEMENTS(au64TestInts));
+    test1<RTCList,   uint64_t, uint64_t, uint64_t>("ST: Specialized type", au64TestInts, RT_ELEMENTS(au64TestInts));
+    test1<RTCMTList, uint64_t, uint64_t, uint64_t>("MT: Specialized type", au64TestInts, RT_ELEMENTS(au64TestInts));
 
     /*
      * Big size type (translate to internal pointer list).
      */
-    test1<iprt::list,   RTCString, RTCString *, const char *>("ST: Class type", g_apszTestStrings, RT_ELEMENTS(g_apszTestStrings));
-    test1<iprt::mtlist, RTCString, RTCString *, const char *>("MT: Class type", g_apszTestStrings, RT_ELEMENTS(g_apszTestStrings));
+    test1<RTCList,   RTCString, RTCString *, const char *>("ST: Class type", g_apszTestStrings, RT_ELEMENTS(g_apszTestStrings));
+    test1<RTCMTList, RTCString, RTCString *, const char *>("MT: Class type", g_apszTestStrings, RT_ELEMENTS(g_apszTestStrings));
 
     /*

trunk/src/VBox/Runtime/testcase/tstIprtMiniString.cpp

@@ -257 +257 @@
 
     /* split */
-    iprt::list<RTCString> spList1 = RTCString("##abcdef##abcdef####abcdef##").split("##", RTCString::RemoveEmptyParts);
+    RTCList<RTCString> spList1 = RTCString("##abcdef##abcdef####abcdef##").split("##", RTCString::RemoveEmptyParts);
     RTTESTI_CHECK(spList1.size() == 3);
     for (size_t i = 0; i < spList1.size(); ++i)
         RTTESTI_CHECK(spList1.at(i) == "abcdef");
-    iprt::list<RTCString> spList2 = RTCString("##abcdef##abcdef####abcdef##").split("##", RTCString::KeepEmptyParts);
+    RTCList<RTCString> spList2 = RTCString("##abcdef##abcdef####abcdef##").split("##", RTCString::KeepEmptyParts);
     RTTESTI_CHECK_RETV(spList2.size() == 5);
     RTTESTI_CHECK(spList2.at(0) == "");
@@ -268 +268 @@
     RTTESTI_CHECK(spList2.at(3) == "");
     RTTESTI_CHECK(spList2.at(4) == "abcdef");
-    iprt::list<RTCString> spList3 = RTCString().split("##", RTCString::KeepEmptyParts);
+    RTCList<RTCString> spList3 = RTCString().split("##", RTCString::KeepEmptyParts);
     RTTESTI_CHECK(spList3.size() == 0);
-    iprt::list<RTCString> spList4 = RTCString().split("");
+    RTCList<RTCString> spList4 = RTCString().split("");
     RTTESTI_CHECK(spList4.size() == 0);
-    iprt::list<RTCString> spList5 = RTCString("abcdef").split("");
+    RTCList<RTCString> spList5 = RTCString("abcdef").split("");
     RTTESTI_CHECK_RETV(spList5.size() == 1);
     RTTESTI_CHECK(spList5.at(0) == "abcdef");
 
     /* join */
-    iprt::list<RTCString> jnList;
+    RTCList<RTCString> jnList;
     strTest = RTCString::join(jnList);
     RTTESTI_CHECK(strTest == "");