Compilation fixes for wxUSE_STL == 1.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@27910 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775

diff --git a/src/common/db.cpp b/src/common/db.cpp
index b5e46f5b89e888e898d1d51c5f2ae4bd842c7033..8403a4ca4232b533fb2f2e4af1f575cf2499e25e 100644 (file)
--- a/src/common/db.cpp
+++ b/src/common/db.cpp
@@ -1658,7 +1658,7 @@ void wxDb::Close(void)
 
 #ifdef __WXDEBUG__
     wxTablesInUse *tiu;
-    wxNode *pNode;
+    wxList::compatibility_iterator pNode;
     pNode = TablesInUse.GetFirst();
     wxString s,s2;
     while (pNode)

diff --git a/src/common/dbtable.cpp b/src/common/dbtable.cpp
index 56a496d843e0675b85ea35d1c888101197dd68b6..1657a14c98ccba1f0db00f669bdfcef7e01a43ae 100644 (file)
--- a/src/common/dbtable.cpp
+++ b/src/common/dbtable.cpp
@@ -321,18 +321,17 @@ void wxDbTable::cleanup()
 #ifdef __WXDEBUG__
     if (tableID)
     {
-        TablesInUse.DeleteContents(TRUE);
         bool found = FALSE;
 
-        wxNode *pNode;
+        wxList::compatibility_iterator pNode;
         pNode = TablesInUse.GetFirst();
         while (pNode && !found)
         {
             if (((wxTablesInUse *)pNode->GetData())->tableID == tableID)
             {
                 found = TRUE;
-                if (!TablesInUse.DeleteNode(pNode))
-                    wxLogDebug (s,wxT("Unable to delete node!"));
+                delete (wxTablesInUse *)pNode->GetData();
+                TablesInUse.Erase(pNode);
             }
             else
                 pNode = pNode->GetNext();