Changeset 18515 in vbox

Timestamp:

Mar 29, 2009 3:33:03 AM (16 years ago)

Author:

vboxsync

Message:

Main/xml: MSC makes a fuss about instantiating objects making use of std::auto_ptr on unknown classes/structs. This is when compiling Settings.cpp. Classes affected: XmlFileParser and GlobalLock.

Location:

trunk

Files:

• include/VBox/xml.h (modified) (2 diffs)
• src/VBox/Main/xml/xml.cpp (modified) (2 diffs)

trunk/include/VBox/xml.h

@@ -422 +422 @@
 
 private:
-    /* Obscure class data */
-    struct Data;
-    std::auto_ptr<Data> m;
+    /* Obscure class data. */
+    struct Data;
+    struct Data *m;
 };
 
@@ -619 +619 @@
     /* Obscure class data */
     struct Data;
-    std::auto_ptr<Data> m;
+    struct Data *m;
 
     static int ReadCallback(void *aCtxt, char *aBuf, int aLen);

trunk/src/VBox/Main/xml/xml.cpp

@@ -390 +390 @@
     if (m->pOldLoader)
         xmlSetExternalEntityLoader(m->pOldLoader);
+    delete m;
+    m = NULL;
 }
 
@@ -1102 +1104 @@
 XmlFileParser::~XmlFileParser()
 {
+    delete m;
+    m = NULL;
 }