Changeset 4491 in orxonox.OLD for orxonox/trunk/src/lib/tinyxml/tinystr.cc

Timestamp:

Jun 3, 2005, 1:40:28 AM (20 years ago)

Author:

bensch

Message:

orxonox/trunk: new tinyXML-lib installed (v-2.3.4)

File:

• orxonox/trunk/src/lib/tinyxml/tinystr.cc (modified) (10 diffs)

orxonox/trunk/src/lib/tinyxml/tinystr.cc

@@ -37 +37 @@
 TiXmlString::TiXmlString (const char* instring)
 {
-    unsigned newlen;
+    size_t newlen;
     char * newstring;
 
@@ -47 +47 @@
         return;
     }
-        //*ME:  warning C4267: convert 'size_t' to 'unsigned int'
-        //*ME:  Use Cast: (unsigned)
-    newlen = (unsigned)strlen (instring) + 1;
+    newlen = strlen (instring) + 1;
     newstring = new char [newlen];
     memcpy (newstring, instring, newlen);
@@ -61 +59 @@
 TiXmlString::TiXmlString (const TiXmlString& copy)
 {
-    unsigned newlen;
+    size_t newlen;
     char * newstring;
 
@@ -87 +85 @@
 void TiXmlString ::operator = (const char * content)
 {
-    unsigned newlen;
+    size_t newlen;
     char * newstring;
 
@@ -95 +93 @@
         return;
     }
-    newlen = (unsigned)strlen (content) + 1;
+    newlen = strlen (content) + 1;
     newstring = new char [newlen];
     // strcpy (newstring, content);
@@ -108 +106 @@
 void TiXmlString ::operator = (const TiXmlString & copy)
 {
-    unsigned newlen;
+    size_t newlen;
     char * newstring;
 
@@ -128 +126 @@
 
 // append a const char * to an existing TiXmlString
-void TiXmlString::append( const char* str, int len )
+void TiXmlString::append( const char* str, size_t len )
 {
     char * new_string;
-    unsigned new_alloc, new_size, size_suffix;
+    size_t new_alloc, new_size, size_suffix;
         
         // don't use strlen - it can overrun the len passed in!
@@ -192 +190 @@
 {
     char * new_string;
-    unsigned new_alloc, new_size;
+    size_t new_alloc, new_size;
 
     new_size = length () + strlen (suffix) + 1;
@@ -252 +250 @@
 unsigned TiXmlString::find (char tofind, unsigned offset) const
 {
-        //*ME:  warning C4244: convert '__w64 int' to 'unsigned'
-        //*ME:  Use Array-Arithmetic instead of Pointer
-        //  char * lookup;
+    char * lookup;
 
     if (offset >= length ())
         return (unsigned) notfound;
-        //  for (lookup = cstring + offset; * lookup; lookup++)
-        //      if (* lookup == tofind)
-        //          return lookup - cstring;
-    for( unsigned n=offset ; cstring[n] != '\0' ; n++ )
-        if( cstring[n] == tofind )
-            return  n ;
+    for (lookup = cstring + offset; * lookup; lookup++)
+        if (* lookup == tofind)
+            return (unsigned)(lookup - cstring);
     return (unsigned) notfound;
 }
@@ -276 +269 @@
                 return ( strcmp( cstring, compare.cstring ) == 0 );
         }
+        else if ( length() == 0 && compare.length() == 0 )
+        {
+                return true;
+        }
         return false;
+}
+
+
+bool TiXmlString::operator == (const char* compare) const
+{
+        if ( allocated && compare && *compare )
+        {
+                assert( cstring );
+                return ( strcmp( cstring, compare ) == 0 );
+        }
+        else if ( length() == 0 && (!compare || !*compare ) )   // this is a little dubious, but try to duplicate behavior in other operator==
+        {
+                return true;
+        }
+        return false;   
 }