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

fix VC9 compilation: interface is #defined as struct in SDK headers, don't use it as variable name

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@55930 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-09-28 10:32:19 +00:00
parent 12ca55868c
commit d2875249ca
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
utils/ifacecheck/src/ifacecheck.cpp
View File

@@ -200,39 +200,39 @@ void IfaceCheckApp::ShowProgress()
bool IfaceCheckApp::Compare() bool IfaceCheckApp::Compare()
{ {
const wxClassArray& interface = m_doxyInterface.GetClasses(); const wxClassArray& interfaces = m_doxyInterface.GetClasses();
const wxClass* c; const wxClass* c;
wxClassPtrArray api; wxClassPtrArray api;
int mcount = 0, ccount = 0; int mcount = 0, ccount = 0;
LogMessage("Comparing the interface API to the real API (%d classes to compare)...", LogMessage("Comparing the interface API to the real API (%d classes to compare)...",
interface.GetCount()); interfaces.GetCount());
if (!m_strToMatch.IsEmpty()) if (!m_strToMatch.IsEmpty())
LogMessage("Processing only header files matching '%s' expression.", m_strToMatch); LogMessage("Processing only header files matching '%s' expression.", m_strToMatch);
for (unsigned int i=0; i<interface.GetCount(); i++) for (unsigned int i=0; i<interfaces.GetCount(); i++)
{ {
// only compare the methods which are available for the port // only compare the methods which are available for the port
// for which the gcc XML was produced // for which the gcc XML was produced
if (interface[i].GetAvailability() != wxPORT_UNKNOWN && if (interfaces[i].GetAvailability() != wxPORT_UNKNOWN &&
(interface[i].GetAvailability() & m_gccInterface.GetInterfacePort()) == 0) { (interfaces[i].GetAvailability() & m_gccInterface.GetInterfacePort()) == 0) {
if (g_verbose) if (g_verbose)
LogMessage("skipping class '%s' since it's not available for the %s port.", LogMessage("skipping class '%s' since it's not available for the %s port.",
interface[i].GetName(), m_gccInterface.GetInterfacePortName()); interfaces[i].GetName(), m_gccInterface.GetInterfacePortName());
continue; // skip this method continue; // skip this method
} }
// shorten the name of the header so the log file is more readable // shorten the name of the header so the log file is more readable
// and also for calling IsToProcess() against it // and also for calling IsToProcess() against it
wxString header = wxFileName(interface[i].GetHeader()).GetFullName(); wxString header = wxFileName(interfaces[i].GetHeader()).GetFullName();
if (!IsToProcess(header)) if (!IsToProcess(header))
continue; // skip this one continue; // skip this one
wxString cname = interface[i].GetName(); wxString cname = interfaces[i].GetName();
api.Empty(); api.Empty();
@@ -255,7 +255,7 @@ bool IfaceCheckApp::Compare()
if (api.GetCount()>0) { if (api.GetCount()>0) {
// there is a class with exactly the same name! // there is a class with exactly the same name!
mcount += CompareClasses(&interface[i], api); mcount += CompareClasses(&interfaces[i], api);
} else { } else {