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

Timestamp:

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

Author:

bensch

Message:

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

File:

• orxonox/trunk/src/lib/tinyxml/tinystr.h (modified) (8 diffs)

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

@@ -32 +32 @@
 
 #ifdef _MSC_VER
-#pragma warning( disable : 4786 )       // Debugger truncating names.
+#pragma warning( disable : 4530 )
+#pragma warning( disable : 4786 )
 #endif
 
@@ -47 +48 @@
 {
   public :
-    // TiXmlString constructor, based on a string
-    TiXmlString (const char * instring);
+    // TiXmlString constructor, based on a string, mark explicit to force
+        // us to find unnecessary casting.
+    explicit TiXmlString (const char * instring);
 
     // TiXmlString empty constructor
@@ -59 +61 @@
 
     // TiXmlString copy constructor
-    TiXmlString (const TiXmlString& copy);
+    explicit TiXmlString (const TiXmlString& copy);
 
     // TiXmlString destructor
@@ -76 +78 @@
 
     // Return the length of a TiXmlString
-    unsigned length () const
+    size_t length () const
         {
                 return ( allocated ) ? current_length : 0;
@@ -108 +110 @@
     }
     bool operator == (const TiXmlString & compare) const;
+    bool operator == (const char* compare) const;
     bool operator < (const TiXmlString & compare) const;
     bool operator > (const TiXmlString & compare) const;
@@ -159 +162 @@
             npos = notfound };
 
-    void append (const char *str, int len );
+    void append (const char *str, size_t len );
 
   protected :
@@ -166 +169 @@
     char * cstring;
     // Number of chars allocated
-    unsigned allocated;
+    size_t allocated;
     // Current string size
-    unsigned current_length;
+    size_t current_length;
 
     // New size computation. It is simplistic right now : it returns twice the amount
     // we need
-    unsigned assign_new_size (unsigned minimum_to_allocate)
+    size_t assign_new_size (size_t minimum_to_allocate)
     {
         return minimum_to_allocate * 2;
@@ -239 +242 @@
 } ;
 
+#ifdef _MSC_VER
+#pragma warning( default : 4530 )
+#pragma warning( default : 4786 )
+#endif
+
 #endif  // TIXML_STRING_INCLUDED
 #endif  // TIXML_USE_STL