fly/flightgear
1
0
Fork 0
Code Activity

Fix compilation with SYSTEM_SQLITE, from Markus Wanner

Browse source 
Fix error "no known conversion for argument 1 from ‘sqlite3_int64
{aka long long int}’ to ‘PositionedID& {aka long int&}’"
(Both those types are int64, but that evidently isn't enough)
This commit is contained in:
Rebecca Palmer 2014-01-24 21:20:10 +00:00 • committed by James Turner
parent c8b1655edc
commit 6adb8b22df
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/Navaids/NavDataCache.cxx
View file

@ -942,6 +942,7 @@ FGPositioned* NavDataCache::NavDataCachePrivate::loadById(sqlite3_int64 rowid)
assert(rowid == sqlite3_column_int64(loadPositioned, 0));
FGPositioned::Type ty = (FGPositioned::Type) sqlite3_column_int(loadPositioned, 1);
PositionedID prowid = static_cast<PositionedID>(rowid);
string ident = (char*) sqlite3_column_text(loadPositioned, 2);
string name = (char*) sqlite3_column_text(loadPositioned, 3);
sqlite3_int64 aptId = sqlite3_column_int64(loadPositioned, 4);
@ -959,7 +960,7 @@ FGPositioned* NavDataCache::NavDataCachePrivate::loadById(sqlite3_int64 rowid)
return loadAirport(rowid, ty, ident, name, pos);
case FGPositioned::TOWER:
return new AirportTower(rowid, aptId, ident, pos);
return new AirportTower(prowid, aptId, ident, pos);
case FGPositioned::RUNWAY:
case FGPositioned::HELIPAD: