Changeset 2278 for code/branches/buildsystem/src/util

Timestamp:

Nov 26, 2008, 5:35:16 PM (16 years ago)

Author:

adrfried

Message:

unsigned int → size_t for std::string related functions

I hope this fixes some problems on 64bit systems

Location:

code/branches/buildsystem/src/util

Files:

• Convert.h (modified) (5 diffs)
• String.cc (modified) (15 diffs)
• String.h (modified) (1 diff)

code/branches/buildsystem/src/util/Convert.h

@@ -512 +512 @@
     static bool convert(orxonox::Vector2* output, const std::string& input)
     {
-        unsigned int opening_parenthesis, closing_parenthesis = input.find(')');
+        size_t opening_parenthesis, closing_parenthesis = input.find(')');
         if ((opening_parenthesis = input.find('(')) == std::string::npos) { opening_parenthesis = 0; } else { opening_parenthesis++; }
 
@@ -536 +536 @@
     static bool convert(orxonox::Vector3* output, const std::string& input)
     {
-        unsigned int opening_parenthesis, closing_parenthesis = input.find(')');
+        size_t opening_parenthesis, closing_parenthesis = input.find(')');
         if ((opening_parenthesis = input.find('(')) == std::string::npos) { opening_parenthesis = 0; } else { opening_parenthesis++; }
 
@@ -562 +562 @@
     static bool convert(orxonox::Vector4* output, const std::string& input)
     {
-        unsigned int opening_parenthesis, closing_parenthesis = input.find(')');
+        size_t opening_parenthesis, closing_parenthesis = input.find(')');
         if ((opening_parenthesis = input.find('(')) == std::string::npos) { opening_parenthesis = 0; } else { opening_parenthesis++; }
 
@@ -590 +590 @@
     static bool convert(orxonox::Quaternion* output, const std::string& input)
     {
-        unsigned int opening_parenthesis, closing_parenthesis = input.find(')');
+        size_t opening_parenthesis, closing_parenthesis = input.find(')');
         if ((opening_parenthesis = input.find('(')) == std::string::npos) { opening_parenthesis = 0; } else { opening_parenthesis++; }
 
@@ -618 +618 @@
     static bool convert(orxonox::ColourValue* output, const std::string& input)
     {
-        unsigned int opening_parenthesis, closing_parenthesis = input.find(')');
+        size_t opening_parenthesis, closing_parenthesis = input.find(')');
         if ((opening_parenthesis = input.find('(')) == std::string::npos) { opening_parenthesis = 0; } else { opening_parenthesis++; }
 

code/branches/buildsystem/src/util/String.cc

@@ -48 +48 @@
 void strip(std::string* str)
 {
-    unsigned int pos;
+    size_t pos;
     while ((pos = (*str).find(" ")) < (*str).length())
         (*str).erase(pos, 1);
@@ -76 +76 @@
 std::string removeTrailingWhitespaces(const std::string& str)
 {
-    unsigned int pos1 = 0;
+    size_t pos1 = 0;
     int pos2 = str.size() - 1;
     for (; pos1 < str.size() && (str[pos1] == ' ' || str[pos1] == '\t' || str[pos1] == '\n'); pos1++);
-    for (; pos2 > 0          && (str[pos2] == ' ' || str[pos2] == '\t' || str[pos2] == '\n'); pos2--);
+    for (; pos2 != 0         && (str[pos2] == ' ' || str[pos2] == '\t' || str[pos2] == '\n'); pos2--);
     return str.substr(pos1, pos2 - pos1 + 1);
 }
@@ -89 +89 @@
     @return The position of the next quote (std::string::npos if there is no next quote)
 */
-unsigned int getNextQuote(const std::string& str, unsigned int start)
-{
-    unsigned int quote = start - 1;
+size_t getNextQuote(const std::string& str, size_t start)
+{
+    size_t quote = start - 1;
 
     while ((quote = str.find('\"', quote + 1)) != std::string::npos)
     {
-        unsigned int backslash = quote;
-        unsigned int numbackslashes = 0;
+        size_t backslash = quote;
+        size_t numbackslashes = 0;
         for (; backslash > 0; backslash--, numbackslashes++)
             if (str[backslash - 1] != '\\')
@@ -114 +114 @@
     @return True if pos is between two quotes
 */
-bool isBetweenQuotes(const std::string& str, unsigned int pos)
+bool isBetweenQuotes(const std::string& str, size_t pos)
 {
     if (pos == std::string::npos)
         return false;
 
-    unsigned int quotecount = 0;
-    unsigned int quote = (unsigned int)-1;
+    size_t quotecount = 0;
+    size_t quote = (size_t)-1;
     while ((quote = getNextQuote(str, quote + 1)) < pos)
     {
@@ -141 +141 @@
 bool hasStringBetweenQuotes(const std::string& str)
 {
-    unsigned int pos1 = getNextQuote(str, 0);
-    unsigned int pos2 = getNextQuote(str, pos1 + 1);
+    size_t pos1 = getNextQuote(str, 0);
+    size_t pos2 = getNextQuote(str, pos1 + 1);
     return (pos1 != std::string::npos && pos2 != std::string::npos && pos2 > pos1 + 1);
 }
@@ -153 +153 @@
 std::string getStringBetweenQuotes(const std::string& str)
 {
-    unsigned int pos1 = getNextQuote(str, 0);
-    unsigned int pos2 = getNextQuote(str, pos1 + 1);
+    size_t pos1 = getNextQuote(str, 0);
+    size_t pos2 = getNextQuote(str, pos1 + 1);
     if (pos1 != std::string::npos && pos2 != std::string::npos)
         return str.substr(pos1, pos2 - pos1 + 1);
@@ -168 +168 @@
 std::string stripEnclosingQuotes(const std::string& str)
 {
-    unsigned int start = std::string::npos;
-    unsigned int end = 0;
-
-    for (unsigned int pos = 0; (pos < str.size()) && (pos < std::string::npos); pos++)
+    size_t start = std::string::npos;
+    size_t end = 0;
+
+    for (size_t pos = 0; (pos < str.size()) && (pos < std::string::npos); pos++)
     {
         if (str[pos] == '"')
@@ -183 +183 @@
     }
 
-    for (unsigned int pos = str.size() - 1; pos < std::string::npos; pos--)
+    for (size_t pos = str.size() - 1; pos < std::string::npos; pos--)
     {
         if (str[pos] == '"')
@@ -290 +290 @@
     std::string output = str;
 
-    for (unsigned int pos = 0; (pos = output.find('\\', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\\\"); }
-    for (unsigned int pos = 0; (pos = output.find('\n', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\n"); }
-    for (unsigned int pos = 0; (pos = output.find('\t', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\t"); }
-    for (unsigned int pos = 0; (pos = output.find('\v', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\v"); }
-    for (unsigned int pos = 0; (pos = output.find('\b', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\b"); }
-    for (unsigned int pos = 0; (pos = output.find('\r', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\r"); }
-    for (unsigned int pos = 0; (pos = output.find('\f', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\f"); }
-    for (unsigned int pos = 0; (pos = output.find('\a', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\a"); }
-    for (unsigned int pos = 0; (pos = output.find('"', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\\""); }
-    for (unsigned int pos = 0; (pos = output.find('\0', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\0"); }
+    for (size_t pos = 0; (pos = output.find('\\', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\\\"); }
+    for (size_t pos = 0; (pos = output.find('\n', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\n"); }
+    for (size_t pos = 0; (pos = output.find('\t', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\t"); }
+    for (size_t pos = 0; (pos = output.find('\v', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\v"); }
+    for (size_t pos = 0; (pos = output.find('\b', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\b"); }
+    for (size_t pos = 0; (pos = output.find('\r', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\r"); }
+    for (size_t pos = 0; (pos = output.find('\f', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\f"); }
+    for (size_t pos = 0; (pos = output.find('\a', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\a"); }
+    for (size_t pos = 0; (pos = output.find('"', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\\""); }
+    for (size_t pos = 0; (pos = output.find('\0', pos)) < std::string::npos; pos += 2) { output.replace(pos, 1, "\\0"); }
 
     return output;
@@ -315 +315 @@
 
     std::string output = "";
-    for (unsigned int pos = 0; pos < str.size() - 1; )
+    for (size_t pos = 0; pos < str.size() - 1; )
     {
         if (str[pos] == '\\')
@@ -345 +345 @@
 void lowercase(std::string* str)
 {
-    for (unsigned int i = 0; i < str->size(); ++i)
+    for (size_t i = 0; i < str->size(); ++i)
     {
         (*str)[i] = (char)tolower((*str)[i]);
@@ -369 +369 @@
 void uppercase(std::string* str)
 {
-    for (unsigned int i = 0; i < str->size(); ++i)
+    for (size_t i = 0; i < str->size(); ++i)
     {
         (*str)[i] = (char)toupper((*str)[i]);
@@ -421 +421 @@
     @param len Maximal number of chars to compare
 */
-int nocaseCmp(const std::string& s1, const std::string& s2, unsigned int len)
+int nocaseCmp(const std::string& s1, const std::string& s2, size_t len)
 {
     if (len == 0)
@@ -466 +466 @@
     @return The position
 */
-unsigned int getCommentPosition(const std::string& str)
+size_t getCommentPosition(const std::string& str)
 {
     return getNextCommentPosition(str, 0);
@@ -477 +477 @@
     @return The position
 */
-unsigned int getNextCommentPosition(const std::string& str, unsigned int start)
-{
-    for (unsigned int i = start; i < str.size(); i++)
+size_t getNextCommentPosition(const std::string& str, size_t start)
+{
+    for (size_t i = start; i < str.size(); i++)
         if (isComment(str.substr(i)))
             return i;

code/branches/buildsystem/src/util/String.h

@@ -42 +42 @@
 extern _UtilExport std::string blankString;
 
-_UtilExport void         strip(std::string* str);
-_UtilExport std::string  getStripped(const std::string& str);
+_UtilExport void        strip(std::string* str);
+_UtilExport std::string getStripped(const std::string& str);
 
-_UtilExport std::string  removeTrailingWhitespaces(const std::string& str);
+_UtilExport std::string removeTrailingWhitespaces(const std::string& str);
 
-_UtilExport unsigned int getNextQuote(const std::string& str, unsigned int start);
-_UtilExport bool         isBetweenQuotes(const std::string& str, unsigned int pos);
+_UtilExport size_t      getNextQuote(const std::string& str, size_t start);
+_UtilExport bool        isBetweenQuotes(const std::string& str, size_t pos);
 
-_UtilExport bool         hasStringBetweenQuotes(const std::string& str);
-_UtilExport std::string  getStringBetweenQuotes(const std::string& str);
+_UtilExport bool        hasStringBetweenQuotes(const std::string& str);
+_UtilExport std::string getStringBetweenQuotes(const std::string& str);
 
-_UtilExport std::string  stripEnclosingQuotes(const std::string& str);
-_UtilExport std::string  stripEnclosingBraces(const std::string& str);
+_UtilExport std::string stripEnclosingQuotes(const std::string& str);
+_UtilExport std::string stripEnclosingBraces(const std::string& str);
 
-_UtilExport bool         isEmpty(const std::string& str);
-_UtilExport bool         isComment(const std::string& str);
-_UtilExport bool         isNumeric(const std::string& str);
+_UtilExport bool        isEmpty(const std::string& str);
+_UtilExport bool        isComment(const std::string& str);
+_UtilExport bool        isNumeric(const std::string& str);
 
-_UtilExport std::string  addSlashes(const std::string& str);
-_UtilExport std::string  removeSlashes(const std::string& str);
+_UtilExport std::string addSlashes(const std::string& str);
+_UtilExport std::string removeSlashes(const std::string& str);
 
-_UtilExport void         lowercase(std::string* str);
-_UtilExport std::string  getLowercase(const std::string& str);
+_UtilExport void        lowercase(std::string* str);
+_UtilExport std::string getLowercase(const std::string& str);
 
-_UtilExport void         uppercase(std::string* str);
-_UtilExport std::string  getUppercase(const std::string& str);
+_UtilExport void        uppercase(std::string* str);
+_UtilExport std::string getUppercase(const std::string& str);
 
-_UtilExport int          nocaseCmp(const std::string& s1, const std::string& s2);
-_UtilExport int          nocaseCmp(const std::string& s1, const std::string& s2, unsigned int len);
+_UtilExport int         nocaseCmp(const std::string& s1, const std::string& s2);
+_UtilExport int         nocaseCmp(const std::string& s1, const std::string& s2, size_t len);
 
-_UtilExport bool         hasComment(const std::string& str);
-_UtilExport std::string  getComment(const std::string& str);
-_UtilExport unsigned int getCommentPosition(const std::string& str);
-_UtilExport unsigned int getNextCommentPosition(const std::string& str, unsigned int start = 0);
+_UtilExport bool        hasComment(const std::string& str);
+_UtilExport std::string getComment(const std::string& str);
+_UtilExport size_t      getCommentPosition(const std::string& str);
+_UtilExport size_t      getNextCommentPosition(const std::string& str, size_t start = 0);
 
 _UtilExport void         convertToWindowsPath(std::string* str);