1 files changed, 18 insertions, 19 deletions

diff --git a/linden/indra/llcommon/llstring.h b/linden/indra/llcommon/llstring.h
index 7b08fd3..5e75188 100644
--- a/linden/indra/llcommon/llstring.h
+++ b/linden/indra/llcommon/llstring.h
@@ -133,26 +133,32 @@ struct char_traits<U16>
 class LLStringOps
 {
 public:
-        static char toUpper(char elem) { return toupper(elem); }
+        static char toUpper(char elem) { return toupper((unsigned char)elem); }
         static llwchar toUpper(llwchar elem) { return towupper(elem); }
         
-        static char toLower(char elem) { return tolower(elem); }
+        static char toLower(char elem) { return tolower((unsigned char)elem); }
         static llwchar toLower(llwchar elem) { return towlower(elem); }
 
-        static BOOL isSpace(char elem) { return isspace(elem) != 0; }
-        static BOOL isSpace(llwchar elem) { return iswspace(elem) != 0; }
+        static bool isSpace(char elem) { return isspace((unsigned char)elem) != 0; }
+        static bool isSpace(llwchar elem) { return iswspace(elem) != 0; }
 
-        static BOOL isUpper(char elem) { return isupper(elem) != 0; }
-        static BOOL isUpper(llwchar elem) { return iswupper(elem) != 0; }
+        static bool isUpper(char elem) { return isupper((unsigned char)elem) != 0; }
+        static bool isUpper(llwchar elem) { return iswupper(elem) != 0; }
 
-        static BOOL isLower(char elem) { return islower(elem) != 0; }
-        static BOOL isLower(llwchar elem) { return iswlower(elem) != 0; }
+        static bool isLower(char elem) { return islower((unsigned char)elem) != 0; }
+        static bool isLower(llwchar elem) { return iswlower(elem) != 0; }
+
+        static bool isDigit(char a) { return isdigit((unsigned char)a) != 0; }
+        static bool isDigit(llwchar a) { return iswdigit(a) != 0; }
+
+        static bool isPunct(char a) { return ispunct((unsigned char)a) != 0; }
+        static bool isPunct(llwchar a) { return iswpunct(a) != 0; }
+
+        static bool isAlnum(char a) { return isalnum((unsigned char)a) != 0; }
+        static bool isAlnum(llwchar a) { return iswalnum(a) != 0; }
 
         static S32      collate(const char* a, const char* b) { return strcoll(a, b); }
         static S32      collate(const llwchar* a, const llwchar* b);
-
-        static BOOL isDigit(char a) { return isdigit(a) != 0; }
-        static BOOL isDigit(llwchar a) { return iswdigit(a) != 0; }
 };
 
 /**
@@ -194,7 +200,7 @@ public:
         typedef std::map<LLFormatMapString, LLFormatMapString> format_map_t;
         static S32 format(std::basic_string<T>& s, const format_map_t& fmt_map);
         
-        static BOOL     isValidIndex(const std::basic_string<T>& string, size_type i)
+        static bool isValidIndex(const std::basic_string<T>& string, size_type i)
         {
                 return !string.empty() && (0 <= i) && (i <= string.size());
         }
@@ -1155,13 +1161,6 @@ BOOL LLStringUtilBase<T>::convertToU32(const std::basic_string<T>& string, U32&
         std::basic_istringstream<T> i_stream((std::basic_string<T>)temp);
         if(i_stream >> v)
         {
-                //TODO: figure out overflow reporting here
-                //if( ULONG_MAX == v )
-                //{
-                //      // Underflow or overflow
-                //      return FALSE;
-                //}
-
                 value = v;
                 return TRUE;
         }