Fix: Don't pollute global namespace with std. (JSBSim-Team#1193)

bcoconni · Nov 24, 2024 · f6ae92e · f6ae92e
1 parent 1dc9e11
commit f6ae92e
Show file tree

Hide file tree

Showing 20 changed files with 191 additions and 182 deletions.
diff --git a/matlab/JSBSimInterface.cpp b/matlab/JSBSimInterface.cpp
@@ -81,7 +81,7 @@ JSBSimInterface::~JSBSimInterface(void)
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-bool JSBSimInterface::OpenAircraft(const string& acName)
+bool JSBSimInterface::OpenAircraft(const std::string& acName)
 {
 
 	if (!fdmExec->GetAircraft()->GetAircraftName().empty()) return false;

diff --git a/src/initialization/FGLinearization.h b/src/initialization/FGLinearization.h
@@ -40,7 +40,7 @@ class JSBSIM_API FGLinearization
 {
     Vector2D<double> A,B,C,D;
     std::vector<double> x0, u0, y0;
-    std::vector<string> x_names, u_names, y_names, x_units, u_units, y_units;
+    std::vector<std::string> x_names, u_names, y_names, x_units, u_units, y_units;
     std::string aircraft_name;
 public:
     /**

diff --git a/src/initialization/FGTrim.h b/src/initialization/FGTrim.h
@@ -110,7 +110,7 @@ CLASS DOCUMENTATION
     fgic->SetAltitudeFtIC(1000);
     fgic->SetClimbRate(500);
     if( !fgt.DoTrim() ) {
-      cout << "Trim Failed" << endl;
+      std::cout << "Trim Failed" << std::endl;
     }
     fgt.Report();
     @endcode

diff --git a/src/input_output/FGPropertyManager.h b/src/input_output/FGPropertyManager.h
@@ -468,15 +468,15 @@ class JSBSIM_API FGPropertyManager
     {
       SGPropertyNode* property = root->getNode(name.c_str(), true);
       if (!property) {
-        cerr << "Could not get or create property " << name << endl;
+        std::cerr << "Could not get or create property " << name << std::endl;
         return;
       }
 
       if (!property->tie(SGRawValuePointer<T>(pointer), false))
-        cerr << "Failed to tie property " << name << " to a pointer" << endl;
+          std::cerr << "Failed to tie property " << name << " to a pointer" << std::endl;
       else {
         tied_properties.push_back(PropertyState(property, nullptr));
-        if (FGJSBBase::debug_lvl & 0x20) cout << name << endl;
+        if (FGJSBBase::debug_lvl & 0x20) std::cout << name << std::endl;
       }
     }
 

diff --git a/src/math/FGParameterValue.h b/src/math/FGParameterValue.h
@@ -64,13 +64,13 @@ class JSBSIM_API FGParameterValue : public FGParameter
   FGParameterValue(Element* el, std::shared_ptr<FGPropertyManager> pm)
   : FGParameterValue(el->GetDataLine(), pm, el)
   {
-    string value = el->GetDataLine();
+    std::string value = el->GetDataLine();
 
     if (el->GetNumDataLines() != 1 || value.empty()) {
-      cerr << el->ReadFrom()
-           << "The element <" << el->GetName()
-           << "> must either contain a value number or a property name."
-           << endl;
+      std::cerr << el->ReadFrom()
+                << "The element <" << el->GetName()
+                << "> must either contain a value number or a property name."
+                << std::endl;
       throw BaseException("FGParameterValue: Illegal argument defining: " + el->GetName());
     }
   }

diff --git a/src/math/FGPropertyValue.cpp b/src/math/FGPropertyValue.cpp
@@ -33,6 +33,8 @@ INCLUDES
 
 #include "FGPropertyValue.h"
 
+using namespace std;
+
 namespace JSBSim {
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/src/models/FGAerodynamics.h b/src/models/FGAerodynamics.h
@@ -278,8 +278,8 @@ class JSBSIM_API FGAerodynamics : public FGModel
   typedef double (FGAerodynamics::*PMF)(int) const;
   void DetermineAxisSystem(Element* document);
   void ProcessAxesNameAndFrame(FGAerodynamics::eAxisType& axisType,
-                               const string& name, const string& frame,
-                               Element* el, const string& validNames);
+                               const std::string& name, const std::string& frame,
+                               Element* el, const std::string& validNames);
   void bind(void);
   void BuildStabilityTransformMatrices(void);
 

diff --git a/src/models/FGAtmosphere.cpp b/src/models/FGAtmosphere.cpp
@@ -46,6 +46,8 @@ INCLUDES
 #include "FGAtmosphere.h"
 #include "input_output/FGLog.h"
 
+using namespace std;
+
 namespace JSBSim {
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/src/models/FGAtmosphere.h b/src/models/FGAtmosphere.h
@@ -268,12 +268,12 @@ class JSBSIM_API FGAtmosphere : public FGModel {
   /// Check that the pressure is within plausible boundaries.
   /// @param msg Message to display if the pressure is out of boundaries
   /// @param quiet Don't display the message if set to true
-  double ValidatePressure(double p, const string& msg, bool quiet=false) const;
+  double ValidatePressure(double p, const std::string& msg, bool quiet=false) const;
 
   /// Check that the temperature is within plausible boundaries.
   /// @param msg Message to display if the pressure is out of boundaries
   /// @param quiet Don't display the message if set to true
-  double ValidateTemperature(double t, const string& msg, bool quiet=false) const;
+  double ValidateTemperature(double t, const std::string& msg, bool quiet=false) const;
 
   /// @name ISA constants
   //@{

diff --git a/src/models/atmosphere/FGStandardAtmosphere.cpp b/src/models/atmosphere/FGStandardAtmosphere.cpp
@@ -51,6 +51,8 @@ INCLUDES
 #include "FGStandardAtmosphere.h"
 #include "input_output/FGLog.h"
 
+using namespace std;
+
 namespace JSBSim {
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/src/models/propulsion/FGTurbine.h b/src/models/propulsion/FGTurbine.h
@@ -328,7 +328,7 @@ class FGSpoolUp : public FGParameter
 public:
   FGSpoolUp(FGTurbine* _turb, double BPR, double factor)
     : turb(_turb), delay(factor * 90.0 / (BPR + 3.0)) {}
-  string GetName(void) const { return string(); };
+  std::string GetName(void) const { return std::string(); };
   double GetValue(void) const {
     // adjust acceleration for N2 and atmospheric density
     double n = std::min(1.0, turb->N2norm + 0.1);
@@ -345,7 +345,7 @@ class FGSimplifiedTSFC : public FGParameter
   FGSimplifiedTSFC(FGTurbine* _turb, double tsfcVal)
     : turb(_turb), tsfc(tsfcVal) {}
 
-  string GetName(void) const { return string(); }
+  std::string GetName(void) const { return std::string(); }
 
   double GetValue(void) const {
     // Correction/denormalisation for temp and thrust

diff --git a/src/simgear/props/props.cxx b/src/simgear/props/props.cxx
@@ -52,6 +52,7 @@ using std::vector;
 using std::stringstream;
 
 using namespace simgear;
+using namespace std;
 
 ////////////////////////////////////////////////////////////////////////
 // Local classes.

diff --git a/src/simgear/props/props.hxx b/src/simgear/props/props.hxx
@@ -73,8 +73,6 @@ namespace boost {
 // XXX This whole file should be in the simgear namespace, but I don't
 // have the guts yet...
 
-using namespace std;
-
 namespace simgear
 {