fly/flightgear
1
0
Fork 0
Code Activity

Fix build with clang 7 on FreeBSD 12-CURRENT:

Browse source 
error: reference to 'stack' is ambiguous

(see: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230502)
This commit is contained in:
Ganael Laplanche 2018-09-01 22:28:41 +02:00
parent ff69754756
commit 2756735d0c
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/FDM/UIUCModel/uiuc_aircraft.h
View file

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

4
src/FDM/UIUCModel/uiuc_parsefile.h
View file

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

2
src/FDM/UIUCModel/uiuc_recorder.cpp
View file

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