Fix build with clang 7 on FreeBSD 12-CURRENT:
error: reference to 'stack' is ambiguous (see: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=230502)
This commit is contained in:
parent
ff69754756
commit
2756735d0c
3 changed files with 4 additions and 4 deletions
|
@ -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,
|
||||
|
|
|
@ -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_
|
||||
|
|
|
@ -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;
|
||||
|
|
Loading…
Reference in a new issue