]> git.mxchange.org Git - flightgear.git/commitdiff
Fix compilation with SYSTEM_SQLITE, from Markus Wanner
authorRebecca Palmer <R.Palmer@bham.ac.uk>
Fri, 24 Jan 2014 21:20:10 +0000 (21:20 +0000)
committerJames Turner <zakalawe@mac.com>
Sun, 26 Jan 2014 10:34:49 +0000 (10:34 +0000)
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)

src/Navaids/NavDataCache.cxx

index 80422483d2d2130cd2be74501bce8734f14418c8..4431fa67df3d7dbe860a6977ddd1fb0aef7e89a9 100644 (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: