Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix VC6 compilation problems due to its for variables scope brokenness (closes #10035)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56068 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-10-03 21:52:59 +00:00
parent b2c36e3549
commit 45a50a2e8f
2 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
samples/sockets/baseclient.cpp
View File

@@ -254,13 +254,14 @@ Client::OnInit()
int int
Client::OnRun() Client::OnRun()
{ {
int i;
switch(m_sendType) switch(m_sendType)
{ {
case STRESS_TEST: case STRESS_TEST:
switch(m_workMode) switch(m_workMode)
{ {
case THREADS: case THREADS:
for (int i = 0; i < m_stressWorkers; i++) { for (i = 0; i < m_stressWorkers; i++) {
if (m_message.empty()) if (m_message.empty())
StartWorker(THREADS); StartWorker(THREADS);
else else
@@ -268,7 +269,7 @@ Client::OnRun()
} }
break; break;
case EVENTS: case EVENTS:
for (int i = 0; i < m_stressWorkers; i++) { for (i = 0; i < m_stressWorkers; i++) {
if (m_message.empty()) if (m_message.empty())
StartWorker(EVENTS); StartWorker(EVENTS);
else else
@@ -276,7 +277,7 @@ Client::OnRun()
} }
break; break;
default: default:
for (int i = 0; i < m_stressWorkers; i++) { for (i = 0; i < m_stressWorkers; i++) {
if (m_message.empty()) if (m_message.empty())
StartWorker(i % 5 == 0 ? THREADS : EVENTS); StartWorker(i % 5 == 0 ? THREADS : EVENTS);
else else
@@ -450,11 +451,11 @@ Client::OnWorkerEvent(WorkerEvent& pEvent) {
break; break;
} }
} }
for(EList::compatibility_iterator it = m_eventWorkers.GetFirst(); it ; it = it->GetNext()) for(EList::compatibility_iterator it2 = m_eventWorkers.GetFirst(); it2 ; it2 = it2->GetNext())
{ {
if (it->GetData() == pEvent.m_sender) { if (it2->GetData() == pEvent.m_sender) {
delete it->GetData(); delete it2->GetData();
m_eventWorkers.DeleteNode(it); m_eventWorkers.DeleteNode(it2);
break; break;
} }
} }

12
samples/sockets/baseserver.cpp
View File

@@ -342,8 +342,8 @@ int Server::OnExit()
delete it->GetData(); delete it->GetData();
} }
for(EList::compatibility_iterator it = m_eventWorkers.GetFirst(); it ; it->GetNext()) { for(EList::compatibility_iterator it2 = m_eventWorkers.GetFirst(); it2 ; it2->GetNext()) {
delete it->GetData(); delete it2->GetData();
} }
m_threadWorkers.Clear(); m_threadWorkers.Clear();
@@ -429,13 +429,13 @@ void Server::OnWorkerEvent(WorkerEvent& pEvent)
break; break;
} }
} }
for(EList::compatibility_iterator it = m_eventWorkers.GetFirst(); it ; it = it->GetNext()) for(EList::compatibility_iterator it2 = m_eventWorkers.GetFirst(); it2 ; it2 = it2->GetNext())
{ {
if (it->GetData() == pEvent.m_sender) if (it2->GetData() == pEvent.m_sender)
{ {
wxLogVerbose(wxT("Deleting event worker (%d left)"),m_eventWorkers.GetCount()); wxLogVerbose(wxT("Deleting event worker (%d left)"),m_eventWorkers.GetCount());
delete it->GetData(); delete it2->GetData();
m_eventWorkers.DeleteNode(it); m_eventWorkers.DeleteNode(it2);
if (!pEvent.m_workerFailed) if (!pEvent.m_workerFailed)
m_eventWorkersDone++; m_eventWorkersDone++;
else else