nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-02-15 08:59:55 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix inexplicable naming conflict

Browse Source 
Somehow this SrmData conflicts with the one in srm.h.  I would have expected
the compiler to flag that, but it didn't.  Weird.
This commit is contained in:
Sean Rhea
2009-08-24 21:21:44 -07:00
parent 6926437dcc
commit e47ef623ca
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/SrmDevice.cpp
View File

@@ -68,11 +68,11 @@ struct SrmpcConn : public boost::noncopyable
~SrmpcConn() { if (d) srmpc_close(d); }
};
struct SrmData : public boost::noncopyable
struct SrmioData : public boost::noncopyable
{
srm_data_t d;
SrmData(srm_data_t d) : d(d) {}
~SrmData() { if (d) srm_data_free(d); }
SrmioData(srm_data_t d) : d(d) {}
~SrmioData() { if (d) srm_data_free(d); }
};
static bool
@@ -107,7 +107,7 @@ SrmDevice::download(CommPortPtr dev, const QDir &tmpdir,
}
int opt_all = 0; // XXX: what does this do?
int opt_fixup = 1; // fix bad data like srmwin.exe does
SrmData srmdata(srmpc_get_data(srm.d, opt_all, opt_fixup));
SrmioData srmdata(srmpc_get_data(srm.d, opt_all, opt_fixup));
if (!srmdata.d) {
err = "srmpc_get_data failed";
return false;