From 7ed8b625c922cc526555c07b2e17c4807ec4af66 Mon Sep 17 00:00:00 2001 From: ThorstenB Date: Mon, 26 Nov 2012 00:23:10 +0100 Subject: [PATCH] Fix a couple of 64-bit warnings identified by GCC. PositionedID is of "int64_t", which depends on platform: apparently it is "long long int" for Mac (requiring %lld format), but it is "long int" for 64bit Linux (requiring %ld). To avoid a "compiler warning fix commit war" ;-) use a type cast to the longest common type (long long int). --- src/AIModel/AIFlightPlanCreate.cxx | 4 ++-- src/AIModel/AIFlightPlanCreatePushBack.cxx | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/AIModel/AIFlightPlanCreate.cxx b/src/AIModel/AIFlightPlanCreate.cxx index 388516ffa..b19099d6f 100644 --- a/src/AIModel/AIFlightPlanCreate.cxx +++ b/src/AIModel/AIFlightPlanCreate.cxx @@ -311,7 +311,7 @@ bool FGAIFlightPlan::createTakeoffTaxi(FGAIAircraft * ac, bool firstFlight, //cerr << "Building taxi route" << endl; while (taxiRoute.next(&node)) { char buffer[10]; - snprintf(buffer, 10, "%lld", node); + snprintf(buffer, 10, "%lld", (long long int) node); FGTaxiNode *tn = apt->getDynamics()->getGroundNetwork()->findNode(node); FGAIWaypoint *wpt = @@ -416,7 +416,7 @@ bool FGAIFlightPlan::createLandingTaxi(FGAIAircraft * ac, FGAirport * apt, for (int i = 0; i < size - 2; i++) { taxiRoute.next(&node); char buffer[10]; - snprintf(buffer, 10, "%lld", node); + snprintf(buffer, 10, "%lld", (long long int) node); FGTaxiNode *tn = gn->findNode(node); FGAIWaypoint *wpt = createOnGround(ac, buffer, tn->geod(), apt->getElevation(), diff --git a/src/AIModel/AIFlightPlanCreatePushBack.cxx b/src/AIModel/AIFlightPlanCreatePushBack.cxx index 976463ccf..eeecfe70b 100644 --- a/src/AIModel/AIFlightPlanCreatePushBack.cxx +++ b/src/AIModel/AIFlightPlanCreatePushBack.cxx @@ -98,7 +98,7 @@ bool FGAIFlightPlan::createPushBack(FGAIAircraft *ac, while (route.next(&node)) { char buffer[10]; - snprintf (buffer, 10, "%lld", node); + snprintf (buffer, 10, "%lld", (long long int) node); FGTaxiNode *tn = groundNet->findNode(node); FGAIWaypoint *wpt = createOnGround(ac, string(buffer), tn->geod(), dep->getElevation(), vTaxiBackward); -- 2.39.5