Changeset 13836 in vbox for trunk/src/VBox/Runtime/common/string

Timestamp:

Nov 5, 2008 2:42:54 AM (17 years ago)

Author:

vboxsync

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

38827

Message:

s/ELEMENTS/RT_ELEMENTS/g - retiring ELEMENTS (finally).

Location:

trunk/src/VBox/Runtime/common/string

Files:

• strformatrt.cpp (modified) (2 diffs)
• uniread.cpp (modified) (7 diffs)

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

@@ -271 +271 @@
                 const char *pszType = *ppszFormat - 1;
                 int         iStart  = 0;
-                int         iEnd    = ELEMENTS(s_aTypes) - 1;
-                int         i       = ELEMENTS(s_aTypes) / 2;
+                int         iEnd    = RT_ELEMENTS(s_aTypes) - 1;
+                int         i       = RT_ELEMENTS(s_aTypes) / 2;
 
                 union
@@ -765 +765 @@
                 const char *pszType = *ppszFormat - 1;
                 int         iStart  = 0;
-                int         iEnd    = ELEMENTS(s_aTypes) - 1;
-                int         i       = ELEMENTS(s_aTypes) / 2;
+                int         iEnd    = RT_ELEMENTS(s_aTypes) - 1;
+                int         i       = RT_ELEMENTS(s_aTypes) / 2;
 
                 union

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

@@ -361 +361 @@
 
         RTUNICP CodePoint = ToNum(pszCodePoint);
-        if (CodePoint >= ELEMENTS(g_aCPInfo))
+        if (CodePoint >= RT_ELEMENTS(g_aCPInfo))
             continue;
 
@@ -394 +394 @@
     }
     /* catchup? */
-    while (i < ELEMENTS(g_aCPInfo))
+    while (i < RT_ELEMENTS(g_aCPInfo))
         NullEntry(i++);
     fclose(pFile);
@@ -410 +410 @@
 static void ApplyProperty(RTUNICP StartCP, const char *pszProperty)
 {
-    if (StartCP >= ELEMENTS(g_aCPInfo))
+    if (StartCP >= RT_ELEMENTS(g_aCPInfo))
         return;
     struct CPINFO *pCPInfo = &g_aCPInfo[StartCP];
@@ -649 +649 @@
     RTUNICP i = 0;
     int iStart = -1;
-    while (i < ELEMENTS(g_aCPInfo))
+    while (i < RT_ELEMENTS(g_aCPInfo))
     {
         /* figure how far off the next chunk is */
@@ -655 +655 @@
         unsigned iNonNull = i;
         while (     (g_aCPInfo[iNonNull].fNullEntry || !CalcFlags(&g_aCPInfo[iNonNull], szFlags))
-               &&   iNonNull < ELEMENTS(g_aCPInfo)
+               &&   iNonNull < RT_ELEMENTS(g_aCPInfo)
                &&   iNonNull >= 256)
             iNonNull++;
-        if (iNonNull - i > 4096 || iNonNull == ELEMENTS(g_aCPInfo))
+        if (iNonNull - i > 4096 || iNonNull == RT_ELEMENTS(g_aCPInfo))
         {
             if (iStart >= 0)
@@ -698 +698 @@
     RTUNICP i = 0;
     int iStart = -1;
-    while (i < ELEMENTS(g_aCPInfo))
+    while (i < RT_ELEMENTS(g_aCPInfo))
     {
         /* figure how far off the next chunk is */
         unsigned iSameCase = i;
         while (     g_aCPInfo[iSameCase].SimpleUpperCaseMapping == g_aCPInfo[iSameCase].CodePoint
-               &&   iSameCase < ELEMENTS(g_aCPInfo)
+               &&   iSameCase < RT_ELEMENTS(g_aCPInfo)
                &&   iSameCase >= 256)
             iSameCase++;
-        if (iSameCase - i > 4096/sizeof(RTUNICP) || iSameCase == ELEMENTS(g_aCPInfo))
+        if (iSameCase - i > 4096/sizeof(RTUNICP) || iSameCase == RT_ELEMENTS(g_aCPInfo))
         {
             if (iStart >= 0)
@@ -745 +745 @@
     RTUNICP i = 0;
     int iStart = -1;
-    while (i < ELEMENTS(g_aCPInfo))
+    while (i < RT_ELEMENTS(g_aCPInfo))
     {
         /* figure how far off the next chunk is */
         unsigned iSameCase = i;
         while (     g_aCPInfo[iSameCase].SimpleLowerCaseMapping == g_aCPInfo[iSameCase].CodePoint
-               &&   iSameCase < ELEMENTS(g_aCPInfo)
+               &&   iSameCase < RT_ELEMENTS(g_aCPInfo)
                &&   iSameCase >= 256)
             iSameCase++;
-        if (iSameCase - i > 4096/sizeof(RTUNICP) || iSameCase == ELEMENTS(g_aCPInfo))
+        if (iSameCase - i > 4096/sizeof(RTUNICP) || iSameCase == RT_ELEMENTS(g_aCPInfo))
         {
             if (iStart >= 0)