Sync. with JSBSim CVS (header cleanups).

src/FDM/JSBSim/FGFDMExec.cpp

@@ -41,19 +41,6 @@ COMMENTS, REFERENCES,  and NOTES
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  include STL_IOSTREAM
-#  include STL_ITERATOR
-#else
-#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
-#    include <iostream.h>
-#  else
-#    include <iostream>
-#  endif
-#  include <iterator>
-#endif
-
 #include "FGFDMExec.h"
 #include "FGState.h"
 #include <models/FGAtmosphere.h>
@@ -77,6 +64,9 @@ INCLUDES
 #include <input_output/FGPropertyManager.h>
 #include <input_output/FGScript.h>
 
+#include <iostream>
+#include <iterator>
+
 namespace JSBSim {
 
 static const char *IdSrc = "$Id$";

src/FDM/JSBSim/FGFDMExec.h

@@ -68,6 +68,7 @@ FORWARD DECLARATIONS
 namespace JSBSim {
 
 class FGScript;
+class FGTrim;
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DOCUMENTATION

src/FDM/JSBSim/FGState.cpp

@@ -36,16 +36,7 @@ HISTORY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  include <math.h>
-#else
-#  if defined(sgi) && !defined(__GNUC__)
-#    include <math.h>
-#  else
 #include <cmath>
-#  endif
-#endif
 
 #include "FGState.h"
 

src/FDM/JSBSim/FGState.h

@@ -41,21 +41,7 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
 #include <fstream>
-#  else
-#    include <fstream.h>
-#  endif
-#else
-#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
-#    include <fstream.h>
-#  else
-#    include <fstream>
-#  endif
-#endif
-
 #include <string>
 #include <map>
 #include "FGJSBBase.h"

src/FDM/JSBSim/initialization/FGInitialCondition.cpp

@@ -42,21 +42,6 @@ you have chosen your IC's wisely) even after setting it up with this class.
 INCLUDES
 *******************************************************************************/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
-#    include <fstream>
-#  else
-#    include <fstream.h>
-#  endif
-#else
-#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
-#    include <fstream.h>
-#  else
-#    include <fstream>
-#  endif
-#endif
-
 #include "FGInitialCondition.h"
 #include <FGFDMExec.h>
 #include <models/FGInertial.h>
@@ -66,8 +51,8 @@ INCLUDES
 #include <input_output/FGPropertyManager.h>
 #include <models/FGPropulsion.h>
 #include <input_output/FGXMLParse.h>
-
 #include <math/FGQuaternion.h>
+#include <fstream>
 
 namespace JSBSim {
 

src/FDM/JSBSim/initialization/FGTrim.cpp

@@ -23,12 +23,10 @@
  Further information about the GNU Lesser General Public License can also be found on
  the world wide web at http://www.gnu.org.
 
-
  HISTORY
 --------------------------------------------------------------------------------
 9/8/99   TP   Created
 
-
 FUNCTIONAL DESCRIPTION
 --------------------------------------------------------------------------------
 
@@ -43,12 +41,10 @@ scheme. */
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#include <stdlib.h>
+#include <cstdlib>
-
+#include "FGTrim.h"
-#include <FGFDMExec.h>
 #include <models/FGAtmosphere.h>
 #include "FGInitialCondition.h"
-#include "FGTrim.h"
 #include <models/FGAircraft.h>
 #include <models/FGMassBalance.h>
 #include <models/FGGroundReactions.h>

src/FDM/JSBSim/initialization/FGTrimAxis.cpp

@@ -37,8 +37,7 @@ INCLUDES
 #endif
 
 #include <string>
-#include <stdlib.h>
+#include <cstdlib>
-
 #include <FGFDMExec.h>
 #include <models/FGAtmosphere.h>
 #include "FGInitialCondition.h"
@@ -47,7 +46,6 @@ INCLUDES
 #include <models/FGPropulsion.h>
 #include <models/FGAerodynamics.h>
 
-
 namespace JSBSim {
 
 static const char *IdSrc = "$Id$";

src/FDM/JSBSim/input_output/FGPropertyManager.cpp

@@ -63,12 +63,7 @@ string FGPropertyManager::mkPropertyName(string name, bool lowercase) {
     else if( isspace(name[i]) )
       name[i]='-';
   }
-  /*
+  
-  for(i=0;i<name.length();i++) {
-    if( name[i] == '/' )
-      name.erase(i,1);
-  }
-  */
   return name;
 }
 

src/FDM/JSBSim/input_output/FGPropertyManager.h

@@ -37,11 +37,7 @@ INCLUDES
 
 #include <string>
 #include <iostream>
-#ifdef FGFS
-#  include <simgear/props/props.hxx>
-#else
 #include "simgear/props/props.hxx"
-#endif
 
 #include "FGJSBBase.h"
 

src/FDM/JSBSim/input_output/FGScript.cpp

@@ -41,23 +41,13 @@ COMMENTS, REFERENCES,  and NOTES
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  include STL_IOSTREAM
-#  include STL_ITERATOR
-#else
-#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
-#    include <iostream.h>
-#  else
-#    include <iostream>
-#  endif
-#  include <iterator>
-#endif
-
 #include "FGScript.h"
 #include <input_output/FGXMLParse.h>
 #include <initialization/FGTrim.h>
 
+#include <iostream>
+#include <iterator>
+
 namespace JSBSim {
 
 static const char *IdSrc = "$Id$";

src/FDM/JSBSim/input_output/FGXMLElement.cpp

@@ -29,29 +29,9 @@ INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "FGXMLElement.h"
-#ifdef FGFS
-#  ifndef __BORLANDC__
-#    include <simgear/compiler.h>
-#  endif
-#  ifdef SG_HAVE_STD_INCLUDES
-#    include <cmath>
-#    include <cstdlib>
-#  else
-#    include <math.h>
-#    include <stdlib.h>
-#  endif
-#else
-#  if defined (sgi) && !defined(__GNUC__)
-#    include <math.h>
-#    include <stdlib.h>
-#  else
-#    include <cmath>
-#    include <cstdlib>
-#  endif
-#endif
 
-#include <stdlib.h>
+#include <cmath>
-#include <math.h>
+#include <cstdlib>
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 FORWARD DECLARATIONS

src/FDM/JSBSim/input_output/FGXMLElement.h

@@ -34,30 +34,11 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
-#    include <string>
-#    include <vector>
-#    include <iostream>
-#    include <map>
-#  else
-#    include <vector.h>
-#    include <string>
-#    include <iostream.h>
-#    include <map.h>
-#  endif
-#else
 #include <string>
 #include <map>
 #include <iostream>
 #include <vector>
-   using std::string;
+
-   using std::map;
-   using std::vector;
-   using std::cout;
-   using std::endl;
-#endif
 using std::string;
 using std::map;
 using std::vector;

src/FDM/JSBSim/input_output/FGXMLParse.cpp

@@ -30,7 +30,7 @@ INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "FGXMLParse.h"
-#include <stdlib.h>
+#include <cstdlib>
 
 namespace JSBSim {
 

src/FDM/JSBSim/input_output/FGXMLParse.h

@@ -34,17 +34,13 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  include STL_STRING
-#else
 #include <string>
 #include <iostream>
+
 using std::string;
 using std::cout;
 using std::cerr;
 using std::endl;
-#endif
 
 #include "FGXMLElement.h"
 #include "simgear/xml/easyxml.hxx"

src/FDM/JSBSim/input_output/FGfdmSocket.h

@@ -39,31 +39,16 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#include <stdio.h>
+#include <cstdio>
-
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  include STL_STRING
-#  include STL_IOSTREAM
-#  include STL_FSTREAM
-   SG_USING_STD(cout);
-   SG_USING_STD(endl);
-#else
 #include <string>
-#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
-#    include <iostream.h>
-#    include <fstream.h>
-#  else
 #include <iostream>
 #include <fstream>
-     using std::cout;
-     using std::endl;
-#  endif
-#endif
-
 #include <sys/types.h>
 #include "FGJSBBase.h"
 
+using std::cout;
+using std::endl;
+
 #if defined(__BORLANDC__) || defined(_MSC_VER) || defined(__MINGW32__)
   #include <winsock.h>
   #include <io.h>
@@ -77,9 +62,7 @@ INCLUDES
 #endif
 
 #ifdef _MSC_VER
-
 #  pragma comment (lib,"WSock32.lib")
-
 #endif
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

src/FDM/JSBSim/math/FGColumnVector3.cpp

@@ -38,7 +38,7 @@ INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "FGColumnVector3.h"
-#include <stdio.h>
+#include <cstdio>
 
 namespace JSBSim {
 

src/FDM/JSBSim/math/FGColumnVector3.h

@@ -39,44 +39,19 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#include <stdlib.h>
+#include <cstdlib>
-#ifdef FGFS
-#  include <math.h>
-#  include <simgear/compiler.h>
-#  include STL_STRING
-#  include STL_FSTREAM
-#  include STL_IOSTREAM
-   SG_USING_STD(string);
-   SG_USING_STD(ostream);
-   SG_USING_STD(istream);
-   SG_USING_STD(cerr);
-   SG_USING_STD(cout);
-   SG_USING_STD(endl);
-#else
 #include <string>
-#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
-#    include <fstream.h>
-#    include <iostream.h>
-#    include <math.h>
-#  else
 #include <fstream>
 #include <iostream>
-#    if defined(sgi) && !defined(__GNUC__)
-#      include <math.h>
-#    else
 #include <cmath>
-#      if !(defined(_MSC_VER) && _MSC_VER <= 1200)
+
-          using std::sqrt;
-#      endif
-#    endif
 using std::ostream;
 using std::istream;
 using std::cerr;
 using std::cout;
 using std::endl;
-#  endif
+using std::sqrt;
 using std::string;
-#endif
 
 #include "FGJSBBase.h"
 

src/FDM/JSBSim/math/FGLocation.cpp

@@ -38,20 +38,7 @@ HISTORY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
 #include <cmath>
-#  else
-#    include <math.h>
-#  endif
-#else
-#  if defined(sgi) && !defined(__GNUC__)
-#    include <math.h>
-#  else
-#    include <cmath>
-#  endif
-#endif
 
 #include "FGLocation.h"
 #include <input_output/FGPropertyManager.h>

src/FDM/JSBSim/math/FGMatrix33.h

@@ -40,41 +40,18 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#include <stdlib.h>
+#include <cstdlib>
-#ifdef FGFS
-#  include <math.h>
-#  include <simgear/compiler.h>
-#  include STL_STRING
-#  include STL_FSTREAM
-#  include STL_IOSTREAM
-   SG_USING_STD(string);
-   SG_USING_STD(ostream);
-   SG_USING_STD(istream);
-   SG_USING_STD(cerr);
-   SG_USING_STD(cout);
-   SG_USING_STD(endl);
-#else
 #include <string>
-#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
-     include <fstream.h>
-     include <iostream.h>
-#    include <math.h>
-#  else
 #include <fstream>
 #include <iostream>
-#    if defined(sgi) && !defined(__GNUC__)
-#      include <math.h>
-#    else
 #include <cmath>
-#    endif
+
 using std::ostream;
 using std::istream;
 using std::cerr;
 using std::cout;
 using std::endl;
-#  endif
 using std::string;
-#endif
 
 #include "FGColumnVector3.h"
 #include "FGJSBBase.h"

src/FDM/JSBSim/math/FGQuaternion.cpp

@@ -38,30 +38,12 @@ SENTRY
   INCLUDES
   %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <math.h>
-#  include <simgear/compiler.h>
-#  include STL_IOSTREAM
-   SG_USING_STD(cerr);
-   SG_USING_STD(cout);
-   SG_USING_STD(endl);
-#else
 #include <string>
-#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
-#    include <iostream.h>
-#    include <math.h>
-#  else
 #include <iostream>
-#    if defined(sgi) && !defined(__GNUC__)
-#      include <math.h>
-#    else
 #include <cmath>
-#    endif
 using std::cerr;
 using std::cout;
 using std::endl;
-#  endif
-#endif
 
 #include "FGMatrix33.h"
 #include "FGColumnVector3.h"

src/FDM/JSBSim/math/FGTable.cpp

@@ -37,12 +37,7 @@ INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "FGTable.h"
-
-#if defined ( sgi ) && !defined( __GNUC__ ) && (_COMPILER_VERSION < 740)
-# include <iomanip.h>
-#else
 #include <iomanip>
-#endif
 
 using namespace std;
 

src/FDM/JSBSim/models/FGAerodynamics.h

@@ -38,19 +38,8 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
 #include <vector>
 #include <map>
-#  else
-#    include <vector.h>
-#    include <map.h>
-#  endif
-#else
-#  include <vector>
-#  include <map>
-#endif
 
 #include "FGModel.h"
 #include <math/FGFunction.h>

src/FDM/JSBSim/models/FGAircraft.cpp

@@ -41,22 +41,7 @@ INCLUDES
 #include <sys/stat.h>
 #include <sys/types.h>
 
-#ifdef FGFS
-#  ifndef __BORLANDC__
-#    include <simgear/compiler.h>
-#  endif
-#  ifdef SG_HAVE_STD_INCLUDES
 #include <cmath>
-#  else
-#    include <math.h>
-#  endif
-#else
-#  if defined (sgi) && !defined(__GNUC__)
-#    include <math.h>
-#  else
-#    include <cmath>
-#  endif
-#endif
 
 #include "FGAircraft.h"
 #include "FGMassBalance.h"

src/FDM/JSBSim/models/FGAircraft.h

@@ -38,16 +38,7 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
 #include <vector>
-#  else
-#    include <vector.h>
-#  endif
-#else
-#  include <vector>
-#endif
 
 #include "FGModel.h"
 #include <input_output/FGXMLElement.h>

src/FDM/JSBSim/models/FGAtmosphere.cpp

@@ -64,7 +64,6 @@ static const char *IdHdr = ID_ATMOSPHERE;
 CLASS IMPLEMENTATION
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-
 FGAtmosphere::FGAtmosphere(FGFDMExec* fdmex) : FGModel(fdmex)
 {
   Name = "FGAtmosphere";

src/FDM/JSBSim/models/FGBuoyantForces.h

@@ -39,19 +39,8 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
 #include <vector>
 #include <map>
-#  else
-#    include <vector.h>
-#    include <map.h>
-#  endif
-#else
-#  include <vector>
-#  include <map>
-#endif
 
 #include "FGModel.h"
 #include "FGGasCell.h"

src/FDM/JSBSim/models/FGExternalReactions.h

@@ -38,10 +38,6 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#endif
-
 #include "FGModel.h"
 #include "FGExternalForce.h"
 #include <input_output/FGXMLElement.h>

src/FDM/JSBSim/models/FGFCS.h

@@ -38,16 +38,7 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
 #include <vector>
-#  else
-#    include <vector.h>
-#  endif
-#else
-#  include <vector>
-#endif
 
 #include <string>
 #include <models/flight_control/FGFCSComponent.h>

src/FDM/JSBSim/models/FGGasCell.cpp

@@ -42,11 +42,9 @@ INCLUDES
 #include <models/FGMassBalance.h>
 #include "FGGasCell.h"
 
-#if !defined ( sgi ) || defined( __GNUC__ ) && (_COMPILER_VERSION < 740)
 using std::cerr;
 using std::endl;
 using std::cout;
-#endif
 
 namespace JSBSim {
 

src/FDM/JSBSim/models/FGGasCell.h

@@ -45,22 +45,11 @@ INCLUDES
 #include <models/propulsion/FGForce.h>
 #include <math/FGFunction.h>
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  include STL_STRING
-  SG_USING_STD(string);
-  SG_USING_STD(cerr);
-  SG_USING_STD(endl);
-  SG_USING_STD(cout);
-#else
 #include <string>
 using std::string;
-# if !defined(sgi) || defined(__GNUC__) || (_COMPILER_VERSION >= 740)
 using std::cerr;
 using std::endl;
 using std::cout;
-# endif
-#endif
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 DEFINITIONS

src/FDM/JSBSim/models/FGGroundReactions.h

@@ -38,16 +38,7 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
 #include <vector>
-#  else
-#    include <vector.h>
-#  endif
-#else
-#  include <vector>
-#endif
 
 #include "FGModel.h"
 #include "FGLGear.h"

src/FDM/JSBSim/models/FGInertial.h

@@ -38,16 +38,7 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
 #include <vector>
-#  else
-#    include <vector.h>
-#  endif
-#else
-#  include <vector>
-#endif
 
 #include "FGModel.h"
 #include <math/FGColumnVector3.h>

src/FDM/JSBSim/models/FGInput.h

@@ -40,19 +40,8 @@ INCLUDES
 
 #include "FGModel.h"
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  include STL_IOSTREAM
-#  include STL_FSTREAM
-#else
-#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
-#    include <iostream.h>
-#    include <fstream.h>
-#  else
 #include <iostream>
 #include <fstream>
-#  endif
-#endif
 
 #include <input_output/FGfdmSocket.h>
 #include <input_output/FGXMLElement.h>

src/FDM/JSBSim/models/FGLGear.h

@@ -38,10 +38,6 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#endif
-
 #include <FGJSBBase.h>
 #include <FGFDMExec.h>
 #include <input_output/FGXMLElement.h>

src/FDM/JSBSim/models/FGModel.h

@@ -42,21 +42,7 @@ INCLUDES
 #include <input_output/FGPropertyManager.h>
 #include <input_output/FGXMLElement.h>
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
 #include <iostream>
-#  else
-#    include <iostream.h>
-#  endif
-#else
-#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
-#    include <iostream.h>
-#  else
-#    include <iostream>
-#  endif
-#endif
-
 #include <string>
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

src/FDM/JSBSim/models/FGOutput.cpp

@@ -68,7 +68,6 @@ INCLUDES
 static const int endianTest = 1;
 #define isLittleEndian (*((char *) &endianTest ) != 0)
 
-
 namespace JSBSim {
 
 static const char *IdSrc = "$Id$";

src/FDM/JSBSim/models/FGOutput.h

@@ -41,19 +41,8 @@ INCLUDES
 
 #include "FGModel.h"
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  include STL_IOSTREAM
-#  include STL_FSTREAM
-#else
-#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
-#    include <iostream.h>
-#    include <fstream.h>
-#  else
 #include <iostream>
 #include <fstream>
-#  endif
-#endif
 
 #include "input_output/FGfdmSocket.h"
 #include "input_output/FGXMLFileRead.h"

src/FDM/JSBSim/models/FGPropagate.cpp

@@ -53,28 +53,8 @@ COMMENTS, REFERENCES,  and NOTES
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
 #include <cmath>
 #include <iomanip>
-#  else
-#    include <math.h>
-#    include <iomanip.h>
-#  endif
-#else
-#  if defined(sgi) && !defined(__GNUC__)
-#    include <math.h>
-#    if (_COMPILER_VERSION < 740)
-#      include <iomanip.h>
-#    else
-#      include <iomanip>
-#    endif
-#  else
-#    include <cmath>
-#    include <iomanip>
-#  endif
-#endif
 
 #include "FGPropagate.h"
 #include <FGState.h>

src/FDM/JSBSim/models/FGPropulsion.cpp

@@ -168,7 +168,7 @@ bool FGPropulsion::Run(void)
 bool FGPropulsion::GetSteadyState(void)
 {
   double currentThrust = 0, lastThrust = -1;
-  int steady_count,j=0;
+  int steady_count = 0, j = 0;
   bool steady = false;
 
   vForces.InitMatrix();
@@ -176,7 +176,7 @@ bool FGPropulsion::GetSteadyState(void)
 
   if (!FGModel::Run()) {
     for (unsigned int i=0; i<numEngines; i++) {
-      cout << "  Finding steady state for engine " << i << endl;
+//      cout << "  Finding steady state for engine " << i << endl;
       Engines[i]->SetTrimMode(true);
       steady=false;
       steady_count=0;
@@ -189,16 +189,16 @@ bool FGPropulsion::GetSteadyState(void)
           steady_count++;
           if (steady_count > 120) {
             steady=true;
-            cout << "    Steady state found at thrust: " << currentThrust << " lbs." << endl;
+//            cout << "    Steady state found at thrust: " << currentThrust << " lbs." << endl;
           }
         } else {
           steady_count=0;
         }
         j++;
       }
-      if (j >= 6000) {
+//      if (j >= 6000) {
-        cout << "    Could not find a steady state for this engine." << endl;
+//        cout << "    Could not find a steady state for this engine." << endl;
-      }
+//      }
       vForces  += Engines[i]->GetBodyForces();  // sum body frame forces
       vMoments += Engines[i]->GetMoments();     // sum body frame moments
       Engines[i]->SetTrimMode(false);

src/FDM/JSBSim/models/FGPropulsion.h

@@ -38,19 +38,8 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
 #include <vector>
 #include <fstream>
-#  else
-#    include <vector.h>
-#    include <fstream.h>
-#  endif
-#else
-#  include <vector>
-#  include <fstream>
-#endif
 
 #include "FGModel.h"
 #include <models/propulsion/FGEngine.h>

src/FDM/JSBSim/models/flight_control/FGFCSComponent.h

@@ -37,15 +37,11 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#endif
-
-#include <string>
-#include <vector>
 #include <FGJSBBase.h>
 #include <input_output/FGPropertyManager.h>
 #include <input_output/FGXMLElement.h>
+#include <string>
+#include <vector>
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 DEFINITIONS
@@ -54,6 +50,7 @@ DEFINITIONS
 #define ID_FCSCOMPONENT "$Id$"
 
 using std::string;
+using std::vector;
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 FORWARD DECLARATIONS

src/FDM/JSBSim/models/flight_control/FGGain.h

@@ -37,18 +37,13 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  include STL_STRING
-   SG_USING_STD(string);
-#else
-#  include <string>
-#endif
-
 #include "FGFCSComponent.h"
+#include <string>
 #include <input_output/FGXMLElement.h>
 #include <math/FGTable.h>
 
+using std::string;
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 DEFINITIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

src/FDM/JSBSim/models/flight_control/FGKinemat.cpp

@@ -37,11 +37,10 @@ COMMENTS, REFERENCES,  and NOTES
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
+#include "FGKinemat.h"
 #include <math.h>
 #include <float.h>
 
-#include "FGKinemat.h"
-
 namespace JSBSim {
 
 static const char *IdSrc = "$Id$";

src/FDM/JSBSim/models/flight_control/FGKinemat.h

@@ -37,20 +37,13 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
-#    include <vector>
-#  else
-#    include <vector.h>
-#  endif
-#else
-#  include <vector>
-#endif
-
-#include <string>
 #include "FGFCSComponent.h"
 #include <input_output/FGXMLElement.h>
+#include <vector>
+#include <string>
+
+using std::vector;
+using std::string;
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 DEFINITIONS

src/FDM/JSBSim/models/flight_control/FGPID.cpp

@@ -101,9 +101,6 @@ FGPID::FGPID(FGFCS* fcs, Element* element) : FGFCSComponent(fcs, element)
     }
   }
 
-  //if (element->FindElement("kp")) Kp = element->FindElementValueAsNumber("kp");
-  //if (element->FindElement("ki")) Ki = element->FindElementValueAsNumber("ki");
-  //if (element->FindElement("kd")) Kd = element->FindElementValueAsNumber("kd");
   if (element->FindElement("trigger")) {
     Trigger =  PropertyManager->GetNode(element->FindElementValue("trigger"));
   }

src/FDM/JSBSim/models/flight_control/FGPID.h

@@ -38,16 +38,9 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  include STL_STRING
-   SG_USING_STD(string);
-#else
-#  include <string>
-#endif
-
 #include "FGFCSComponent.h"
 #include <input_output/FGXMLElement.h>
+#include <string>
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 DEFINITIONS
@@ -55,6 +48,10 @@ DEFINITIONS
 
 #define ID_PID "$Id$"
 
+using std::string;
+
+using std::string;
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

src/FDM/JSBSim/models/flight_control/FGSummer.h

@@ -37,20 +37,10 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
-#    include <vector>
-#  else
-#    include <vector.h>
-#  endif
-#else
-#  include <vector>
-#endif
-
-#include <string>
 #include "FGFCSComponent.h"
 #include <input_output/FGXMLElement.h>
+#include <vector>
+#include <string>
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 DEFINITIONS
@@ -58,6 +48,12 @@ DEFINITIONS
 
 #define ID_SUMMER "$Id$"
 
+using std::vector;
+using std::string;
+
+using std::vector;
+using std::string;
+
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 FORWARD DECLARATIONS
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

src/FDM/JSBSim/models/propulsion/FGEngine.cpp

@@ -37,27 +37,13 @@ HISTORY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  ifdef SG_HAVE_STD_INCLUDES
-#    include <fstream>
-#  else
-#    include <fstream.h>
-#  endif
-#else
-#  if defined(sgi) && !defined(__GNUC__) && (_COMPILER_VERSION < 740)
-#    include <fstream.h>
-#  else
-#    include <fstream>
-#  endif
-#endif
-
 #include "FGEngine.h"
 #include "FGTank.h"
 #include "FGPropeller.h"
 #include "FGNozzle.h"
 #include <input_output/FGXMLParse.h>
 #include <math/FGColumnVector3.h>
+#include <fstream>
 
 namespace JSBSim {
 

src/FDM/JSBSim/models/propulsion/FGEngine.h

@@ -43,24 +43,12 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#  include STL_STRING
-   SG_USING_STD(string);
-#  ifdef SG_HAVE_STD_INCLUDES
-#    include <vector>
-#  else
-#    include <vector.h>
-#  endif
-#else
-#  include <vector>
-#  include <string>
-#endif
-
 #include <FGJSBBase.h>
 #include "FGThruster.h"
 #include <input_output/FGPropertyManager.h>
 #include <input_output/FGXMLFileRead.h>
+#include <vector>
+#include <string>
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 DEFINITIONS

src/FDM/JSBSim/models/propulsion/FGPiston.cpp

@@ -627,13 +627,12 @@ void FGPiston::doEnginePower(void)
     double T_amb_sea_lev_degF = KelvinToFahrenheit(288);
 
     // FIXME: this needs to be generalized
-    double ManXRPM, ME, Adjusted_BSFC;  // Convienience term for use in the calculations
+    double ME, Adjusted_BSFC;  // Convienience term for use in the calculations
     ME = Mixture_Efficiency_Correlation->GetValue(m_dot_fuel/m_dot_air);
     Adjusted_BSFC = (1/ThrottlePos) * BSFC;
     Percentage_Power = 1.000;
 
-    if( Magnetos != 3 )
+    if ( Magnetos != 3 ) Percentage_Power *= SparkFailDrop;
-      Percentage_Power *= SparkFailDrop;
 
     HP = (FuelFlow_gph * 6.0 / Adjusted_BSFC )* ME * suction_loss * Percentage_Power;
 

src/FDM/JSBSim/models/propulsion/FGTank.cpp

@@ -38,11 +38,9 @@ INCLUDES
 
 #include "FGTank.h"
 
-#if !defined ( sgi ) || defined( __GNUC__ ) && (_COMPILER_VERSION < 740)
 using std::cerr;
 using std::endl;
 using std::cout;
-#endif
 
 namespace JSBSim {
 

src/FDM/JSBSim/models/propulsion/FGTank.h

@@ -48,12 +48,8 @@ INCLUDES
 #include <input_output/FGXMLElement.h>
 #include <math/FGColumnVector3.h>
 #include <models/FGAuxiliary.h>
-
-#ifdef FGFS
-#  include <simgear/compiler.h>
-#endif
-
 #include <string>
+
 using std::string;
 using std::cerr;
 using std::endl;
@@ -210,13 +206,38 @@ public:
   /** Resets the tank parameters to the initial conditions */
   void ResetToIC(void);
 
+  /** If the tank is supplying fuel, this function returns true.
+      @return true if this tank is feeding an engine.*/
   bool GetSelected(void) {return Selected;}
+
+  /** Gets the tank fill level.
+      @return the fill level in percent, from 0 to 100.*/
   double GetPctFull(void) {return PctFull;}
+
+  /** Gets the capacity of the tank.
+      @return the capacity of the tank in pounds. */
   double GetCapacity(void) {return Capacity;}
+
+  /** Gets the contents of the tank.
+      @return the contents of the tank in pounds. */
   double GetContents(void) const {return Contents;}
+
+  /** Gets the temperature of the fuel.
+      The temperature of the fuel is calculated if an initial tempearture is
+      given in the configuration file. 
+      @return the temperature of the fuel in degrees C IF an initial temperature
+      is given, otherwise 0.0 C is returned. */
   double GetTemperature_degC(void) {return Temperature;}
+
+  /** Gets the temperature of the fuel.
+      The temperature of the fuel is calculated if an initial tempearture is
+      given in the configuration file. 
+      @return the temperature of the fuel in degrees F IF an initial temperature
+      is given, otherwise 32 degrees F is returned. */
   double GetTemperature(void) {return CelsiusToFahrenheit(Temperature);}
+
   double GetStandpipe(void) {return Standpipe;}
+
   const FGColumnVector3 GetXYZ(void);
   const double GetXYZ(int idx);