From: ehofman <ehofman>
Date: Tue, 1 Jul 2003 16:12:21 +0000 (+0000)
Subject: Solaris namespace clash fix
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=53aceeafe8332a83fe0f536aae2242e927f57051;p=flightgear.git

Solaris namespace clash fix
---

diff --git a/src/FDM/JSBSim/FGJSBBase.cpp b/src/FDM/JSBSim/FGJSBBase.cpp
index db7c0c348..ecd8da25d 100644
--- a/src/FDM/JSBSim/FGJSBBase.cpp
+++ b/src/FDM/JSBSim/FGJSBBase.cpp
@@ -71,7 +71,7 @@ const double FGJSBBase::SHRatio = 1.40;
 const string FGJSBBase::needed_cfg_version = "1.60";
 const string FGJSBBase::JSBSim_version = "0.9.4";
 
-queue <FGJSBBase::Message*> FGJSBBase::Messages;
+std::queue <FGJSBBase::Message*> FGJSBBase::Messages;
 FGJSBBase::Message FGJSBBase::localMsg;
 unsigned int FGJSBBase::messageId = 0; 
 unsigned int FGJSBBase::frame = 0;
diff --git a/src/FDM/JSBSim/FGJSBBase.h b/src/FDM/JSBSim/FGJSBBase.h
index 3bb80e6d3..7515b9219 100644
--- a/src/FDM/JSBSim/FGJSBBase.h
+++ b/src/FDM/JSBSim/FGJSBBase.h
@@ -45,7 +45,6 @@ INCLUDES
 #  include STL_STRING
 
 SG_USING_STD(string);
-SG_USING_STD(queue);
 
 # ifndef M_PI
 #  include <simgear/constants.h>
@@ -63,7 +62,6 @@ SG_USING_STD(queue);
 #  endif
 
 using std::string;
-using std::queue;
 
 # ifndef M_PI
 #  define M_PI 3.14159265358979323846
@@ -221,7 +219,7 @@ public:
 protected:
   static Message localMsg;
   
-  static queue <Message*> Messages;
+  static std::queue <Message*> Messages;
 
   virtual void Debug(int from) {};