fly/flightgear
1
0
Fork 0
Code Activity

Solaris namespace clash fix

Browse source
This commit is contained in:
ehofman 2003-07-01 16:12:21 +00:00
parent 9d10d88f8f
commit 53aceeafe8
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/FDM/JSBSim/FGJSBBase.cpp
View file

@ -71,7 +71,7 @@ const double FGJSBBase::SHRatio = 1.40;
const string FGJSBBase::needed_cfg_version = "1.60"; const string FGJSBBase::needed_cfg_version = "1.60";
const string FGJSBBase::JSBSim_version = "0.9.4"; const string FGJSBBase::JSBSim_version = "0.9.4";
queue <FGJSBBase::Message*> FGJSBBase::Messages; std::queue <FGJSBBase::Message*> FGJSBBase::Messages;
FGJSBBase::Message FGJSBBase::localMsg; FGJSBBase::Message FGJSBBase::localMsg;
unsigned int FGJSBBase::messageId = 0; unsigned int FGJSBBase::messageId = 0;
unsigned int FGJSBBase::frame = 0; unsigned int FGJSBBase::frame = 0;

4
src/FDM/JSBSim/FGJSBBase.h
View file

@ -45,7 +45,6 @@ INCLUDES
# include STL_STRING # include STL_STRING
SG_USING_STD(string); SG_USING_STD(string);
SG_USING_STD(queue);
# ifndef M_PI # ifndef M_PI
# include <simgear/constants.h> # include <simgear/constants.h>
@ -63,7 +62,6 @@ SG_USING_STD(queue);
# endif # endif
using std::string; using std::string;
using std::queue;
# ifndef M_PI # ifndef M_PI
# define M_PI 3.14159265358979323846 # define M_PI 3.14159265358979323846
@ -221,7 +219,7 @@ public:
protected: protected:
static Message localMsg; static Message localMsg;
static queue <Message*> Messages; static std::queue <Message*> Messages;
virtual void Debug(int from) {}; virtual void Debug(int from) {};