From 6adb8b22dfdbc1ffffab94c19079307623134644 Mon Sep 17 00:00:00 2001 From: Rebecca Palmer <R.Palmer@bham.ac.uk> Date: Fri, 24 Jan 2014 21:20:10 +0000 Subject: [PATCH] Fix compilation with SYSTEM_SQLITE, from Markus Wanner MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Navaids/NavDataCache.cxx b/src/Navaids/NavDataCache.cxx index 80422483d..4431fa67d 100644 --- a/src/Navaids/NavDataCache.cxx +++ b/src/Navaids/NavDataCache.cxx @@ -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: