Changeset 738 for code/branches/FICN/src/tinyxml/tinystr.h

Timestamp:

Dec 31, 2007, 12:06:33 AM (16 years ago)

Author:

landauf

Message:

updated to the newest tinyXML library and changed one line in the LevelLoader

File:

• code/branches/FICN/src/tinyxml/tinystr.h (modified) (5 diffs)

code/branches/FICN/src/tinyxml/tinystr.h

@@ -43 +43 @@
 #include <string.h>
 
+/*      The support for explicit isn't that universal, and it isn't really
+        required - it is used to check that the TiXmlString class isn't incorrectly
+        used. Be nice to old compilers and macro it here:
+*/
+#if defined(_MSC_VER) && (_MSC_VER >= 1200 )
+        // Microsoft visual studio, version 6 and higher.
+        #define TIXML_EXPLICIT explicit
+#elif defined(__GNUC__) && (__GNUC__ >= 3 )
+        // GCC version 3 and higher.s
+        #define TIXML_EXPLICIT explicit
+#else
+        #define TIXML_EXPLICIT
+#endif
+
+
 /*
    TiXmlString is an emulation of a subset of the std::string template.
@@ -54 +69 @@
   public :
         // The size type used
-        typedef unsigned int size_type;
+        typedef size_t size_type;
 
         // Error value for find primitive
@@ -66 +81 @@
 
         // TiXmlString copy constructor
-        TiXmlString (const TiXmlString & copy)
+        TiXmlString ( const TiXmlString & copy) : rep_(0)
         {
                 init(copy.length());
@@ -73 +88 @@
 
         // TiXmlString constructor, based on a string
-        TiXmlString (const char * copy)
+        TIXML_EXPLICIT TiXmlString ( const char * copy) : rep_(0)
         {
                 init( static_cast<size_type>( strlen(copy) ));
@@ -80 +95 @@
 
         // TiXmlString constructor, based on a string
-        TiXmlString (const char * str, size_type len)
+        TIXML_EXPLICIT TiXmlString ( const char * str, size_type len) : rep_(0)
         {
                 init(len);