Cleaned up some unix compilation problems due to for loops declaring a variable in the for statement
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/branches/WX_2_2_BRANCH@7445 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -1959,7 +1959,8 @@ wxDbColInf *wxDb::GetColumns(char *tableName[], const char* WXUNUSED(userID))
|
|||||||
_TableColumns *TableColumns = new _TableColumns[tbl];
|
_TableColumns *TableColumns = new _TableColumns[tbl];
|
||||||
|
|
||||||
// Fill the table
|
// Fill the table
|
||||||
for (int i = 0 ; i < tbl ; i++)
|
int i;
|
||||||
|
for (i = 0 ; i < tbl ; i++)
|
||||||
{
|
{
|
||||||
TableColumns[i].colInf = GetColumns(tableName[i], &TableColumns[i].noCols);
|
TableColumns[i].colInf = GetColumns(tableName[i], &TableColumns[i].noCols);
|
||||||
if (TableColumns[i].colInf == NULL) return NULL;
|
if (TableColumns[i].colInf == NULL) return NULL;
|
||||||
@@ -1976,13 +1977,14 @@ wxDbColInf *wxDb::GetColumns(char *tableName[], const char* WXUNUSED(userID))
|
|||||||
|
|
||||||
// Merge ...
|
// Merge ...
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
for (int i = 0 ; i < tbl ; i++)
|
int j;
|
||||||
{
|
for (i = 0 ; i < tbl ; i++)
|
||||||
for (int j = 0 ; j < TableColumns[i].noCols ; j++)
|
{
|
||||||
{
|
for (j = 0 ; j < TableColumns[i].noCols ; j++)
|
||||||
colInf[offset++] = TableColumns[i].colInf[j];
|
{
|
||||||
}
|
colInf[offset++] = TableColumns[i].colInf[j];
|
||||||
}
|
}
|
||||||
|
}
|
||||||
delete [] TableColumns;
|
delete [] TableColumns;
|
||||||
|
|
||||||
return colInf;
|
return colInf;
|
||||||
|
Reference in New Issue
Block a user