[Wxlua-commit] wxLua/modules/wxluasocket/src dservice.cpp, 1.29, 1.30 wxluasocket.cpp, 1.19, 1.20 wxluasocket_bind.cpp, 1.14, 1.15

[John L. <jr...@us...>]

Update of /cvsroot/wxlua/wxLua/modules/wxluasocket/src
In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv6284/wxLua/modules/wxluasocket/src

Modified Files:
	dservice.cpp wxluasocket.cpp wxluasocket_bind.cpp 
Log Message:
use wxList::compatibility_iterator not wxNode* for wxUSE_STL == 1 and 0


Index: wxluasocket_bind.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket_bind.cpp,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** wxluasocket_bind.cpp	15 Mar 2007 23:24:58 -0000	1.14
--- wxluasocket_bind.cpp	19 Mar 2007 03:47:21 -0000	1.15
***************
*** 187,191 ****
  {
      static wxLuaBinding_wxluasocket m_binding;
!     wxLuaBindingList::Node *node = wxLuaBinding::GetBindingList()->Find(&m_binding);
      if (node && (node->GetData() == &m_binding))
          return false;
--- 187,191 ----
  {
      static wxLuaBinding_wxluasocket m_binding;
!     wxLuaBindingList::compatibility_iterator node = wxLuaBinding::GetBindingList()->Find(&m_binding);
      if (node && (node->GetData() == &m_binding))
          return false;

Index: dservice.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/dservice.cpp,v
retrieving revision 1.29
retrieving revision 1.30
diff -C2 -d -r1.29 -r1.30
*** dservice.cpp	12 Dec 2006 01:23:40 -0000	1.29
--- dservice.cpp	19 Mar 2007 03:47:21 -0000	1.30
***************
*** 116,121 ****
  
      // Cleanup Debuggee List
!     wxLuaDebuggeeList::Node* nodeDebuggee;
!     wxLuaDebuggeeList::Node* nextDebuggee;
  
      for (nodeDebuggee = m_debuggeeList.GetFirst(); nodeDebuggee; nodeDebuggee = nextDebuggee)
--- 116,121 ----
  
      // Cleanup Debuggee List
!     wxLuaDebuggeeList::compatibility_iterator nodeDebuggee;
!     wxLuaDebuggeeList::compatibility_iterator nextDebuggee;
  
      for (nodeDebuggee = m_debuggeeList.GetFirst(); nodeDebuggee; nodeDebuggee = nextDebuggee)
***************
*** 129,134 ****
  
      // Cleanup Debugger Socket List
!     wxLuaDebugSocketList::Node* nodeDebuggerSocket;
!     wxLuaDebugSocketList::Node* nextDebuggerSocket;
  
      for (nodeDebuggerSocket = m_debuggerSocketList.GetFirst(); nodeDebuggerSocket; nodeDebuggerSocket = nextDebuggerSocket)
--- 129,134 ----
  
      // Cleanup Debugger Socket List
!     wxLuaDebugSocketList::compatibility_iterator nodeDebuggerSocket;
!     wxLuaDebugSocketList::compatibility_iterator nextDebuggerSocket;
  
      for (nodeDebuggerSocket = m_debuggerSocketList.GetFirst(); nodeDebuggerSocket; nodeDebuggerSocket = nextDebuggerSocket)
***************
*** 375,379 ****
              wxCriticalSectionLocker locker(m_debuggerSocketListCriticalSection);
  
!             for ( wxLuaDebugSocketList::Node *node = m_debuggerSocketList.GetFirst(); node; node = node->GetNext() )
              {
                  if (node->GetData()->GetSocket() == sock)
--- 375,380 ----
              wxCriticalSectionLocker locker(m_debuggerSocketListCriticalSection);
  
!             wxLuaDebugSocketList::compatibility_iterator node;
!             for ( node = m_debuggerSocketList.GetFirst(); node; node = node->GetNext() )
              {
                  if (node->GetData()->GetSocket() == sock)
***************
*** 838,843 ****
  {
      // Cleanup Break Point List
!     wxLuaBreakPointList::Node* nodeBreakPoint;
!     wxLuaBreakPointList::Node* nextBreakPoint;
  
      for (nodeBreakPoint = m_breakPointList.GetFirst(); nodeBreakPoint; nodeBreakPoint = nextBreakPoint)
--- 839,844 ----
  {
      // Cleanup Break Point List
!     wxLuaBreakPointList::compatibility_iterator nodeBreakPoint;
!     wxLuaBreakPointList::compatibility_iterator nextBreakPoint;
  
      for (nodeBreakPoint = m_breakPointList.GetFirst(); nodeBreakPoint; nodeBreakPoint = nextBreakPoint)
***************
*** 1009,1013 ****
      wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber);
  
!     wxLuaBreakPointList::Node* node = m_breakPointList.Find(breakPointKey);
      if (!node)
      {
--- 1010,1014 ----
      wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber);
  
!     wxLuaBreakPointList::compatibility_iterator node = m_breakPointList.Find(breakPointKey);
      if (!node)
      {
***************
*** 1030,1034 ****
      wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber);
  
!     wxLuaBreakPointList::Node* node = m_breakPointList.Find(breakPointKey);
      if (node)
      {
--- 1031,1035 ----
      wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber);
  
!     wxLuaBreakPointList::compatibility_iterator node = m_breakPointList.Find(breakPointKey);
      if (node)
      {
***************
*** 1053,1057 ****
      wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber);
  
!     wxLuaBreakPointList::Node* node = m_breakPointList.Find(breakPointKey);
      if (node)
      {
--- 1054,1058 ----
      wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber);
  
!     wxLuaBreakPointList::compatibility_iterator node = m_breakPointList.Find(breakPointKey);
      if (node)
      {
***************
*** 1066,1070 ****
      wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber);
  
!     wxLuaBreakPointList::Node* node = m_breakPointList.Find(breakPointKey);
      if (node)
      {
--- 1067,1071 ----
      wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber);
  
!     wxLuaBreakPointList::compatibility_iterator node = m_breakPointList.Find(breakPointKey);
      if (node)
      {
***************
*** 1346,1350 ****
      wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber);
  
!     wxLuaBreakPointList::Node* node = m_breakPointList.Find(breakPointKey);
      return (node && node->GetData()->GetEnabled());
  }
--- 1347,1351 ----
      wxString breakPointKey = wxLuaBreakPoint::GetBreakPointKey(fileName, lineNumber);
  
!     wxLuaBreakPointList::compatibility_iterator node = m_breakPointList.Find(breakPointKey);
      return (node && node->GetData()->GetEnabled());
  }
***************
*** 1386,1391 ****
  
      // Notify Debugger of Each BreakPoint
!     wxLuaBreakPointList::Node* nodeBreakPoint;
!     wxLuaBreakPointList::Node* nextBreakPoint;
  
      for (nodeBreakPoint = m_breakPointList.GetFirst(); nodeBreakPoint; nodeBreakPoint = nextBreakPoint)
--- 1387,1392 ----
  
      // Notify Debugger of Each BreakPoint
!     wxLuaBreakPointList::compatibility_iterator nodeBreakPoint;
!     wxLuaBreakPointList::compatibility_iterator nextBreakPoint;
  
      for (nodeBreakPoint = m_breakPointList.GetFirst(); nodeBreakPoint; nodeBreakPoint = nextBreakPoint)

Index: wxluasocket.cpp
===================================================================
RCS file: /cvsroot/wxlua/wxLua/modules/wxluasocket/src/wxluasocket.cpp,v
retrieving revision 1.19
retrieving revision 1.20
diff -C2 -d -r1.19 -r1.20
*** wxluasocket.cpp	15 Mar 2007 23:24:58 -0000	1.19
--- wxluasocket.cpp	19 Mar 2007 03:47:21 -0000	1.20
***************
*** 388,394 ****
      { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluaargArray_None },
      { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor },
  };
  
! int wxLuaDebuggerServer_methodCount = sizeof(wxLuaDebuggerServer_methods)/sizeof(wxLuaDebuggerServer_methods[0]);
  
  // ---------------------------------------------------------------------------
--- 388,395 ----
      { LuaMethod, "StopServer", wxLua_wxLuaDebuggerServer_StopServer, 0, 0, s_wxluaargArray_None },
      { LuaConstructor, "wxLuaDebuggerServer", wxLua_wxLuaDebuggerServer_constructor, 1, 1, s_wxluatagArray_wxLua_wxLuaDebuggerServer_constructor },
+     { LuaMethod, 0, 0, 0, 0 },
  };
  
! int wxLuaDebuggerServer_methodCount = sizeof(wxLuaDebuggerServer_methods)/sizeof(wxLuaDebuggerServer_methods[0]) - 1;
  
  // ---------------------------------------------------------------------------
***************
*** 481,486 ****
      { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluaargArray_None },
  };
  
! int wxLuaDebuggerEvent_methodCount = sizeof(wxLuaDebuggerEvent_methods)/sizeof(wxLuaDebuggerEvent_methods[0]);
  
--- 482,488 ----
      { LuaMethod, "GetMessage", wxLua_wxLuaDebuggerEvent_GetMessage, 0, 0, s_wxluaargArray_None },
      { LuaMethod, "GetReference", wxLua_wxLuaDebuggerEvent_GetReference, 0, 0, s_wxluaargArray_None },
+     { LuaMethod, 0, 0, 0, 0 },
  };
  
! int wxLuaDebuggerEvent_methodCount = sizeof(wxLuaDebuggerEvent_methods)/sizeof(wxLuaDebuggerEvent_methods[0]) - 1;