1
0
Fork 0

Merge /u/martymac/flightgear/ branch clang7-FreeBSD into next

https://sourceforge.net/p/flightgear/flightgear/merge-requests/141/
This commit is contained in:
James Turner 2018-09-02 18:20:36 +00:00
commit 95be7220a2
4 changed files with 5 additions and 5 deletions

View file

@ -93,7 +93,7 @@ bool FGAIFlightPlan::createPushBack(FGAIAircraft *ac,
FGGroundNetwork* groundNet = dep->groundNetwork();
FGParking *parking = gate.parking();
if (parking && parking->getPushBackPoint() > 0) {
if (parking && parking->getPushBackPoint() != nullptr) {
FGTaxiRoute route = groundNet->findShortestRoute(parking, parking->getPushBackPoint(), false);
int size = route.size();

View file

@ -150,7 +150,7 @@
#include "uiuc_parsefile.h"
#include "uiuc_flapdata.h"
typedef stack :: iterator LIST;
typedef ::stack :: iterator LIST;
/* Add more keywords here if required*/
enum {init_flag = 1000, geometry_flag, controlSurface_flag, controlsMixer_flag,

View file

@ -23,7 +23,7 @@ class ParseFile
{
private:
stack commands;
::stack commands;
ifstream file;
void readFile();
@ -37,7 +37,7 @@ class ParseFile
void removeComments(string& inputLine);
string getToken(string inputLine, int tokenNo);
void storeCommands(string inputLine);
stack getCommands();
::stack getCommands();
};
#endif // _PARSE_FILE_H_

View file

@ -102,7 +102,7 @@ using std::endl; // -dw
void uiuc_recorder( double dt )
{
stack command_list;
::stack command_list;
string linetoken;
// static int init = 0;
static int recordStep = 0;