Sync. with JSBSim CVS (header cleanups).

diff --git a/src/FDM/JSBSim/FGFDMExec.cpp b/src/FDM/JSBSim/FGFDMExec.cpp
index 5ed9ce5310a7561651d88f7b51b1935585db0754..3bf7c700bbf749809f89ef455781981fd447ebfd 100644 (file)
--- a/src/FDM/JSBSim/FGFDMExec.cpp
+++ b/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$";

diff --git a/src/FDM/JSBSim/FGFDMExec.h b/src/FDM/JSBSim/FGFDMExec.h
index 6a92a2e817a128338101949fbd7126f9a2d4afd6..787a43d759f1387df2774a2279b7e8c30016de67 100644 (file)
--- a/src/FDM/JSBSim/FGFDMExec.h
+++ b/src/FDM/JSBSim/FGFDMExec.h
@@ -68,6 +68,7 @@ FORWARD DECLARATIONS
 namespace JSBSim {
 
 class FGScript;
+class FGTrim;
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 CLASS DOCUMENTATION

diff --git a/src/FDM/JSBSim/FGState.cpp b/src/FDM/JSBSim/FGState.cpp
index 53d40ec2ced15c03014ec2f4483bda2e018c5485..f5fc784f2765c23b9c44d443616e943589c9985e 100644 (file)
--- a/src/FDM/JSBSim/FGState.cpp
+++ b/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 <cmath>
 
 #include "FGState.h"
 

diff --git a/src/FDM/JSBSim/FGState.h b/src/FDM/JSBSim/FGState.h
index 079377c15ef8c76bd6d40707ba777f6e42abba35..d1ca3d74ff7a803faf7cbb24facb44cbe13212fa 100644 (file)
--- a/src/FDM/JSBSim/FGState.h
+++ b/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 <fstream>
 #include <string>
 #include <map>
 #include "FGJSBBase.h"

diff --git a/src/FDM/JSBSim/initialization/FGInitialCondition.cpp b/src/FDM/JSBSim/initialization/FGInitialCondition.cpp
index 5975a048a035c964456d04159d82c1defc32cdc8..bbfebe7ce78824d3312e428fb1f6a8882c8dd83a 100644 (file)
--- a/src/FDM/JSBSim/initialization/FGInitialCondition.cpp
+++ b/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 {
 

diff --git a/src/FDM/JSBSim/initialization/FGTrim.cpp b/src/FDM/JSBSim/initialization/FGTrim.cpp
index 8979f9e3b887a143a90e1086e7bd2c1fc12acb23..099ec495a32790a23677c6cb680b148481614d60 100644 (file)
--- a/src/FDM/JSBSim/initialization/FGTrim.cpp
+++ b/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 <FGFDMExec.h>
+#include <cstdlib>
+#include "FGTrim.h"
 #include <models/FGAtmosphere.h>
 #include "FGInitialCondition.h"
-#include "FGTrim.h"
 #include <models/FGAircraft.h>
 #include <models/FGMassBalance.h>
 #include <models/FGGroundReactions.h>

diff --git a/src/FDM/JSBSim/initialization/FGTrimAxis.cpp b/src/FDM/JSBSim/initialization/FGTrimAxis.cpp
index 8557adc89904b3ce0e296474b3a677756a032f27..5124c31bbd62cc4202514ce27b85f704b3f2cd04 100644 (file)
--- a/src/FDM/JSBSim/initialization/FGTrimAxis.cpp
+++ b/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$";

diff --git a/src/FDM/JSBSim/input_output/FGPropertyManager.cpp b/src/FDM/JSBSim/input_output/FGPropertyManager.cpp
index cf36fddc97a83651681d080ad8be6827fba79bbf..991badb909c112bc7c4b48fac8861628bc04eb4b 100755 (executable)
--- a/src/FDM/JSBSim/input_output/FGPropertyManager.cpp
+++ b/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;
 }
 

diff --git a/src/FDM/JSBSim/input_output/FGPropertyManager.h b/src/FDM/JSBSim/input_output/FGPropertyManager.h
index 4e3b5626ab4ee353ed236b9541cd460045be52c4..fdd5c40776c51a37cbad7f376c1e0d14d7f2281d 100644 (file)
--- a/src/FDM/JSBSim/input_output/FGPropertyManager.h
+++ b/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 "simgear/props/props.hxx"
 
 #include "FGJSBBase.h"
 

diff --git a/src/FDM/JSBSim/input_output/FGScript.cpp b/src/FDM/JSBSim/input_output/FGScript.cpp
index 0d032fbde33422810e56cd993028172c54174f29..e0cddc34bdf8139f33632a5f517202958be7190f 100755 (executable)
--- a/src/FDM/JSBSim/input_output/FGScript.cpp
+++ b/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$";

diff --git a/src/FDM/JSBSim/input_output/FGXMLElement.cpp b/src/FDM/JSBSim/input_output/FGXMLElement.cpp
index a32ce27c7d9bce27c2ac49a4dfec3bae10a07b9c..b683d32b3549b4aedbfeb1e97e66974149e05afc 100755 (executable)
--- a/src/FDM/JSBSim/input_output/FGXMLElement.cpp
+++ b/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 <math.h>
+
+#include <cmath>
+#include <cstdlib>
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 FORWARD DECLARATIONS

diff --git a/src/FDM/JSBSim/input_output/FGXMLElement.h b/src/FDM/JSBSim/input_output/FGXMLElement.h
index b30dfaf5361946028a485b527742cde34b00c99d..acfb074362f638ba265cf1726577c2b4a94cddca 100755 (executable)
--- a/src/FDM/JSBSim/input_output/FGXMLElement.h
+++ b/src/FDM/JSBSim/input_output/FGXMLElement.h
@@ -34,35 +34,16 @@ 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;
-   using std::cout;
-   using std::endl;
+#include <string>
+#include <map>
+#include <iostream>
+#include <vector>
+
+using std::string;
+using std::map;
+using std::vector;
+using std::cout;
+using std::endl;
 
 #include <math/FGColumnVector3.h>
 

diff --git a/src/FDM/JSBSim/input_output/FGXMLParse.cpp b/src/FDM/JSBSim/input_output/FGXMLParse.cpp
index d00d074c74209dadaded96eff4eaaad3ec47fdd0..5a57040a42d018caf6e2f5416965e8bae9d0f0af 100755 (executable)
--- a/src/FDM/JSBSim/input_output/FGXMLParse.cpp
+++ b/src/FDM/JSBSim/input_output/FGXMLParse.cpp
@@ -30,7 +30,7 @@ INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "FGXMLParse.h"
-#include <stdlib.h>
+#include <cstdlib>
 
 namespace JSBSim {
 

diff --git a/src/FDM/JSBSim/input_output/FGXMLParse.h b/src/FDM/JSBSim/input_output/FGXMLParse.h
index 2d58acf447939821597b92ecd0632a3e56abc0d9..c966902436f8f29f50fe61c965e1224594757395 100755 (executable)
--- a/src/FDM/JSBSim/input_output/FGXMLParse.h
+++ b/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 <string>
+#include <iostream>
+
+using std::string;
+using std::cout;
+using std::cerr;
+using std::endl;
 
 #include "FGXMLElement.h"
 #include "simgear/xml/easyxml.hxx"

diff --git a/src/FDM/JSBSim/input_output/FGfdmSocket.h b/src/FDM/JSBSim/input_output/FGfdmSocket.h
index 14330bfea4ecfca7a7d9471af35bee920d5b4630..59db72325567d8c5e99dbbfbfc5e7f00374a4e95 100644 (file)
--- a/src/FDM/JSBSim/input_output/FGfdmSocket.h
+++ b/src/FDM/JSBSim/input_output/FGfdmSocket.h
@@ -39,31 +39,16 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#include <stdio.h>
-
-#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 <cstdio>
+#include <string>
+#include <iostream>
+#include <fstream>
 #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")
-
+#  pragma comment (lib,"WSock32.lib")
 #endif
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/src/FDM/JSBSim/math/FGColumnVector3.cpp b/src/FDM/JSBSim/math/FGColumnVector3.cpp
index f34afe5923420592ecadda642b44f2bbca6df0a2..73f291b309c2d834e18eb9972b90c6eb888db4d9 100644 (file)
--- a/src/FDM/JSBSim/math/FGColumnVector3.cpp
+++ b/src/FDM/JSBSim/math/FGColumnVector3.cpp
@@ -38,7 +38,7 @@ INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
 #include "FGColumnVector3.h"
-#include <stdio.h>
+#include <cstdio>
 
 namespace JSBSim {
 

diff --git a/src/FDM/JSBSim/math/FGColumnVector3.h b/src/FDM/JSBSim/math/FGColumnVector3.h
index 58af989ed5cc7e89537a0d760ac7233f525a102e..5fe76e77ac5430937994e1f0977da709c512eef7 100644 (file)
--- a/src/FDM/JSBSim/math/FGColumnVector3.h
+++ b/src/FDM/JSBSim/math/FGColumnVector3.h
@@ -39,44 +39,19 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#include <stdlib.h>
-#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::string;
-#endif
+#include <cstdlib>
+#include <string>
+#include <fstream>
+#include <iostream>
+#include <cmath>
+
+using std::ostream;
+using std::istream;
+using std::cerr;
+using std::cout;
+using std::endl;
+using std::sqrt;
+using std::string;
 
 #include "FGJSBBase.h"
 

diff --git a/src/FDM/JSBSim/math/FGLocation.cpp b/src/FDM/JSBSim/math/FGLocation.cpp
index 6ba2328df0cef40efc891aeb9ba93739a5c0883f..4eea80ad2668d06bdb05be46d737711dcb938c5b 100644 (file)
--- a/src/FDM/JSBSim/math/FGLocation.cpp
+++ b/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 <cmath>
 
 #include "FGLocation.h"
 #include <input_output/FGPropertyManager.h>

diff --git a/src/FDM/JSBSim/math/FGMatrix33.h b/src/FDM/JSBSim/math/FGMatrix33.h
index 1204612c1b33f2c9641e312d2f592c654426c52f..4e8234bfd91ff4d7e10d04e0e1b652437c46cba3 100644 (file)
--- a/src/FDM/JSBSim/math/FGMatrix33.h
+++ b/src/FDM/JSBSim/math/FGMatrix33.h
@@ -40,41 +40,18 @@ SENTRY
 INCLUDES
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/
 
-#include <stdlib.h>
-#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 <cstdlib>
+#include <string>
+#include <fstream>
+#include <iostream>
+#include <cmath>
+
+using std::ostream;
+using std::istream;
+using std::cerr;
+using std::cout;
+using std::endl;
+using std::string;
 
 #include "FGColumnVector3.h"
 #include "FGJSBBase.h"

diff --git a/src/FDM/JSBSim/math/FGQuaternion.cpp b/src/FDM/JSBSim/math/FGQuaternion.cpp
index 700d7a3c56032f5663a595f336994b0fcd864f67..6ab1c39546f7c7087277819d4c66d1366c0f08a3 100644 (file)
--- a/src/FDM/JSBSim/math/FGQuaternion.cpp
+++ b/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 <string>
+#include <iostream>
+#include <cmath>
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #include "FGMatrix33.h"
 #include "FGColumnVector3.h"

diff --git a/src/FDM/JSBSim/math/FGTable.cpp b/src/FDM/JSBSim/math/FGTable.cpp
index ed45983c6a2d1a54d4f474c2b7bba7d5342627cc..e3c9fcf5c091d8553101858ed9ded0d24e05616c 100644 (file)
--- a/src/FDM/JSBSim/math/FGTable.cpp
+++ b/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
+#include <iomanip>
 
 using namespace std;
 

diff --git a/src/FDM/JSBSim/models/FGAerodynamics.h b/src/FDM/JSBSim/models/FGAerodynamics.h
index 140816273b4432b5229454435287768563bc56bf..0f5c6c1456e3d2dcf97e526c3a5990055ea932c5 100644 (file)
--- a/src/FDM/JSBSim/models/FGAerodynamics.h
+++ b/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 <vector>
+#include <map>
 
 #include "FGModel.h"
 #include <math/FGFunction.h>

diff --git a/src/FDM/JSBSim/models/FGAircraft.cpp b/src/FDM/JSBSim/models/FGAircraft.cpp
index c1d3ec86f0aa80cc711798c03be116f5bc615478..5dd8612c61c1c3221cc6514e340e0f14a8fe963f 100644 (file)
--- a/src/FDM/JSBSim/models/FGAircraft.cpp
+++ b/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 <cmath>
 
 #include "FGAircraft.h"
 #include "FGMassBalance.h"

diff --git a/src/FDM/JSBSim/models/FGAircraft.h b/src/FDM/JSBSim/models/FGAircraft.h
index 485d0efd33574c0e1a7b48b6e3e73f48e3ddcf8a..f833c3a79c05bf4dd94e11526dad69426684c26c 100644 (file)
--- a/src/FDM/JSBSim/models/FGAircraft.h
+++ b/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 <vector>
 
 #include "FGModel.h"
 #include <input_output/FGXMLElement.h>

diff --git a/src/FDM/JSBSim/models/FGAtmosphere.cpp b/src/FDM/JSBSim/models/FGAtmosphere.cpp
index 95afb809274b0fef8548ba8d241eee7f23960de2..dda86fc13ecff9d5d477d8179ca9eb12838ff38b 100644 (file)
--- a/src/FDM/JSBSim/models/FGAtmosphere.cpp
+++ b/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";

diff --git a/src/FDM/JSBSim/models/FGBuoyantForces.h b/src/FDM/JSBSim/models/FGBuoyantForces.h
index 86f5d696f38194ce58bb7dd060b0fcebc1e88c6f..4cd87259fab0b72e27d701378a540e4eaed3c848 100644 (file)
--- a/src/FDM/JSBSim/models/FGBuoyantForces.h
+++ b/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 <vector>
+#include <map>
 
 #include "FGModel.h"
 #include "FGGasCell.h"

diff --git a/src/FDM/JSBSim/models/FGExternalReactions.h b/src/FDM/JSBSim/models/FGExternalReactions.h
index 16db9c7b179590fb42e8651262c121037e1dbcf6..f32cab28f46eb4f8d80335d4e66cf77ee8f65adb 100755 (executable)
--- a/src/FDM/JSBSim/models/FGExternalReactions.h
+++ b/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>

diff --git a/src/FDM/JSBSim/models/FGFCS.h b/src/FDM/JSBSim/models/FGFCS.h
index 3868118ca6280fe9521f33b741dd1b57a5f1ffcb..6b1bd5a22974748d6a1b109a9e4b03b47c917ed3 100644 (file)
--- a/src/FDM/JSBSim/models/FGFCS.h
+++ b/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 <vector>
 
 #include <string>
 #include <models/flight_control/FGFCSComponent.h>

diff --git a/src/FDM/JSBSim/models/FGGasCell.cpp b/src/FDM/JSBSim/models/FGGasCell.cpp
index 255b7abae12c25a867a8e82397decf48102eef5a..f876defd61f25f67a16b440bfa9db25bc7e18630 100644 (file)
--- a/src/FDM/JSBSim/models/FGGasCell.cpp
+++ b/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 {
 

diff --git a/src/FDM/JSBSim/models/FGGasCell.h b/src/FDM/JSBSim/models/FGGasCell.h
index 4c1759a548553781e19a209264b70d90785b095b..010c6c8eb4095cc394e272eadbc5f7f7bde7a2ff 100644 (file)
--- a/src/FDM/JSBSim/models/FGGasCell.h
+++ b/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
+#include <string>
+using std::string;
+using std::cerr;
+using std::endl;
+using std::cout;
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 DEFINITIONS

diff --git a/src/FDM/JSBSim/models/FGGroundReactions.h b/src/FDM/JSBSim/models/FGGroundReactions.h
index 2a1b8e2424ebb08899b681b2c09164d01e244914..a7870f1673fc0dce601f5f7899f4db6883c90ec1 100644 (file)
--- a/src/FDM/JSBSim/models/FGGroundReactions.h
+++ b/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 <vector>
 
 #include "FGModel.h"
 #include "FGLGear.h"

diff --git a/src/FDM/JSBSim/models/FGInertial.h b/src/FDM/JSBSim/models/FGInertial.h
index 03671d60b5319ad2819a43473ed409767ede7bb7..adf46d3590b2fb246a8e176d3fb7c2995567bdd8 100644 (file)
--- a/src/FDM/JSBSim/models/FGInertial.h
+++ b/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 <vector>
 
 #include "FGModel.h"
 #include <math/FGColumnVector3.h>

diff --git a/src/FDM/JSBSim/models/FGInput.h b/src/FDM/JSBSim/models/FGInput.h
index a20e741f8103c9987d400088172b227f61de3c93..6ccaddfbb72755741ed626ef662bfa0f94e9b22f 100755 (executable)
--- a/src/FDM/JSBSim/models/FGInput.h
+++ b/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 <iostream>
+#include <fstream>
 
 #include <input_output/FGfdmSocket.h>
 #include <input_output/FGXMLElement.h>

diff --git a/src/FDM/JSBSim/models/FGLGear.h b/src/FDM/JSBSim/models/FGLGear.h
index 8fe0bb20f63dacc409b43813aeb9140957dddfb2..fae36f62c76ed5f9feb6365739868076c9bed224 100644 (file)
--- a/src/FDM/JSBSim/models/FGLGear.h
+++ b/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>

diff --git a/src/FDM/JSBSim/models/FGModel.h b/src/FDM/JSBSim/models/FGModel.h
index 3260d22cc76d579cf18e83cc05e1c4214d8796a4..369a5255ceaa6bdfcbcdc2ada49d530ae61c99d7 100644 (file)
--- a/src/FDM/JSBSim/models/FGModel.h
+++ b/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 <iostream>
 #include <string>
 
 /*%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%

diff --git a/src/FDM/JSBSim/models/FGOutput.cpp b/src/FDM/JSBSim/models/FGOutput.cpp
index b3c54658cabba6ec52bb6294ae1b6274661f52be..7da464e0e455b1cfbec652bb64adaf6cf3dfcbc1 100644 (file)
--- a/src/FDM/JSBSim/models/FGOutput.cpp
+++ b/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$";

diff --git a/src/FDM/JSBSim/models/FGOutput.h b/src/FDM/JSBSim/models/FGOutput.h
index 335dcfeaf4bf79a4efa988d32d67dc95a94afa6a..7194c119b0ceb0d9894f77ee74fc3ea84f3aa31d 100644 (file)
--- a/src/FDM/JSBSim/models/FGOutput.h
+++ b/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 <iostream>
+#include <fstream>
 
 #include "input_output/FGfdmSocket.h"
 #include "input_output/FGXMLFileRead.h"

diff --git a/src/FDM/JSBSim/models/FGPropagate.cpp b/src/FDM/JSBSim/models/FGPropagate.cpp
index 2f2abc6475ccf1ab5c72db46eecddb8a6f4e4f5e..943d0b2fa04f91dc760ac592dbe8d190af8c773d 100644 (file)
--- a/src/FDM/JSBSim/models/FGPropagate.cpp
+++ b/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 <cmath>
+#include <iomanip>
 
 #include "FGPropagate.h"
 #include <FGState.h>

diff --git a/src/FDM/JSBSim/models/FGPropulsion.cpp b/src/FDM/JSBSim/models/FGPropulsion.cpp
index aff448a591ad2ed6138a0360d669fb52ab75ed90..7a0d6f15660ffb65393682cf62f6a4b7aee81179 100644 (file)
--- a/src/FDM/JSBSim/models/FGPropulsion.cpp
+++ b/src/FDM/JSBSim/models/FGPropulsion.cpp
@@ -167,16 +167,16 @@ bool FGPropulsion::Run(void)
 
 bool FGPropulsion::GetSteadyState(void)
 {
-  double currentThrust = 0, lastThrust=-1;
-  int steady_count,j=0;
-  bool steady=false;
+  double currentThrust = 0, lastThrust = -1;
+  int steady_count = 0, j = 0;
+  bool steady = false;
 
   vForces.InitMatrix();
   vMoments.InitMatrix();
 
   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) {
-        cout << "    Could not find a steady state for this engine." << endl;
-      }
+//      if (j >= 6000) {
+//        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);

diff --git a/src/FDM/JSBSim/models/FGPropulsion.h b/src/FDM/JSBSim/models/FGPropulsion.h
index 71351477e721b0b6b9d1033d67fb102b73a63ea3..b812f19680c6274bcb3dedc178f7306e20f430b9 100644 (file)
--- a/src/FDM/JSBSim/models/FGPropulsion.h
+++ b/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 <vector>
+#include <fstream>
 
 #include "FGModel.h"
 #include <models/propulsion/FGEngine.h>

diff --git a/src/FDM/JSBSim/models/flight_control/FGFCSComponent.h b/src/FDM/JSBSim/models/flight_control/FGFCSComponent.h
index 8e0fa14f4b73e66177d42e94354f56e311b568b0..3ce2f41543d7bbca02e3149af791efa1e64526b7 100644 (file)
--- a/src/FDM/JSBSim/models/flight_control/FGFCSComponent.h
+++ b/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

diff --git a/src/FDM/JSBSim/models/flight_control/FGGain.h b/src/FDM/JSBSim/models/flight_control/FGGain.h
index d0f501e4ea71c1c8f7c04d4704f25b760fdeeba6..7ab7925c3dbfd2ad385f8caa7074fcf42e2334ee 100644 (file)
--- a/src/FDM/JSBSim/models/flight_control/FGGain.h
+++ b/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
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

diff --git a/src/FDM/JSBSim/models/flight_control/FGKinemat.cpp b/src/FDM/JSBSim/models/flight_control/FGKinemat.cpp
index ad2034b0b63f16279f08ba900bf0895c065bd063..5949cf710b7c2572824789ad84d8e306baea3d46 100644 (file)
--- a/src/FDM/JSBSim/models/flight_control/FGKinemat.cpp
+++ b/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$";

diff --git a/src/FDM/JSBSim/models/flight_control/FGKinemat.h b/src/FDM/JSBSim/models/flight_control/FGKinemat.h
index 71eeedffb59ea9ee8c8e812fef3c280894024e81..13d2ec7d967491de46c220ad22b386834d8d96db 100644 (file)
--- a/src/FDM/JSBSim/models/flight_control/FGKinemat.h
+++ b/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

diff --git a/src/FDM/JSBSim/models/flight_control/FGPID.cpp b/src/FDM/JSBSim/models/flight_control/FGPID.cpp
index e2395e3a114fad6949ae7bf556452219738a9b3d..27be32c3271acd41e0028ae436e542e57cfbfdb2 100755 (executable)
--- a/src/FDM/JSBSim/models/flight_control/FGPID.cpp
+++ b/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"));
   }

diff --git a/src/FDM/JSBSim/models/flight_control/FGPID.h b/src/FDM/JSBSim/models/flight_control/FGPID.h
index b365f3537ddc57cfeaece31e5c7ccc5b95282935..754ae14d278140f29e69973dab79218dc338b280 100755 (executable)
--- a/src/FDM/JSBSim/models/flight_control/FGPID.h
+++ b/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
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

diff --git a/src/FDM/JSBSim/models/flight_control/FGSummer.h b/src/FDM/JSBSim/models/flight_control/FGSummer.h
index ed65eead94c0aa4eefca397e8138df67a7810b95..cc11352f50d42d976dbefe65d3f5c3d5f975bdb3 100644 (file)
--- a/src/FDM/JSBSim/models/flight_control/FGSummer.h
+++ b/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
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%*/

diff --git a/src/FDM/JSBSim/models/propulsion/FGEngine.cpp b/src/FDM/JSBSim/models/propulsion/FGEngine.cpp
index 08c2e5be6748bf33980c6b8c5253ed738fcdada8..bcca56cb7462775a3c31051a131763e505328731 100644 (file)
--- a/src/FDM/JSBSim/models/propulsion/FGEngine.cpp
+++ b/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 {
 

diff --git a/src/FDM/JSBSim/models/propulsion/FGEngine.h b/src/FDM/JSBSim/models/propulsion/FGEngine.h
index 1f245683734f634b3f6bbd73a34483f5586fb65a..225c39a0fc9b05bc7db5c873af9d08497ff21095 100644 (file)
--- a/src/FDM/JSBSim/models/propulsion/FGEngine.h
+++ b/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

diff --git a/src/FDM/JSBSim/models/propulsion/FGPiston.cpp b/src/FDM/JSBSim/models/propulsion/FGPiston.cpp
index 8e300b944eebbf481b3b18a75f7631f65ac32443..2297ebaeffa3492ec4aee4296e3f582c185ae353 100644 (file)
--- a/src/FDM/JSBSim/models/propulsion/FGPiston.cpp
+++ b/src/FDM/JSBSim/models/propulsion/FGPiston.cpp
@@ -167,16 +167,16 @@ FGPiston::FGPiston(FGFDMExec* exec, Element* el, int engine_number)
 /*
 Manifold_Pressure_Lookup = new
 
-       0       0.2     0.4     0.6     0.8     1
-0          1.0000      1.0000  1.0000  1.0000  1.0000  1.0000
-1000   0.7778  0.8212  0.8647  0.9081  0.9516  0.9950
-2000   0.5556  0.6424  0.7293  0.8162  0.9031  0.9900
-3000   0.3333  0.4637  0.5940  0.7243  0.8547  0.9850
-4000   0.2000  0.2849  0.4587  0.6324  0.8062  0.9800
-5000   0.2000  0.2000  0.3233  0.5406  0.7578  0.9750
-6000   0.2000  0.2000  0.2000  0.4487  0.7093  0.9700
-7000   0.2000  0.2000  0.2000  0.2000  0.4570  0.7611
-8000   0.2000  0.2000  0.2000  0.2000  0.2047  0.5522
+        0       0.2      0.4      0.6      0.8     1
+0        1.0000    1.0000    1.0000    1.0000    1.0000    1.0000
+1000    0.7778    0.8212    0.8647    0.9081    0.9516    0.9950
+2000    0.5556    0.6424    0.7293    0.8162    0.9031    0.9900
+3000    0.3333    0.4637    0.5940    0.7243    0.8547    0.9850
+4000    0.2000    0.2849    0.4587    0.6324    0.8062    0.9800
+5000    0.2000    0.2000    0.3233    0.5406    0.7578    0.9750
+6000    0.2000    0.2000    0.2000    0.4487    0.7093    0.9700
+7000    0.2000    0.2000    0.2000    0.2000    0.4570    0.7611
+8000    0.2000    0.2000    0.2000    0.2000    0.2047    0.5522
 */
 
   // Read inputs from engine data file where present.
@@ -513,8 +513,8 @@ void FGPiston::doBoostControl(void)
 
 void FGPiston::doMAP(void)
 {
-       suction_loss = pow( ThrottlePos*0.98, RPM/MaxRPM );
-       MAP = p_amb * suction_loss;
+    suction_loss = pow( ThrottlePos*0.98, RPM/MaxRPM );
+    MAP = p_amb * suction_loss;
 
     if(Boosted) {
       // If takeoff boost is fitted, we currently assume the following throttle map:
@@ -599,10 +599,10 @@ void FGPiston::doFuelFlow(void)
   double AFR = 10+(12*(1-Mixture));// mixture 10:1 to 22:1
   m_dot_fuel = m_dot_air / AFR;
   FuelFlow_gph = m_dot_fuel
-    * 3600                     // seconds to hours
-    * 2.2046                   // kg to lb
-    / 6.0;                     // lb to gal_us of gasoline
-//    / 6.6;                   // lb to gal_us of kerosene
+    * 3600            // seconds to hours
+    * 2.2046            // kg to lb
+    / 6.0;            // lb to gal_us of gasoline
+//    / 6.6;            // lb to gal_us of kerosene
 }
 
 //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -627,15 +627,14 @@ 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
-       ME = Mixture_Efficiency_Correlation->GetValue(m_dot_fuel/m_dot_air);
-       Adjusted_BSFC = (1/ThrottlePos) * BSFC;
-       Percentage_Power = 1.000;
+    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 )
-      Percentage_Power *= SparkFailDrop;
+    if ( Magnetos != 3 ) Percentage_Power *= SparkFailDrop;
 
-      HP = (FuelFlow_gph * 6.0 / Adjusted_BSFC )* ME * suction_loss * Percentage_Power;
+    HP = (FuelFlow_gph * 6.0 / Adjusted_BSFC )* ME * suction_loss * Percentage_Power;
 
   } else {
 
@@ -775,7 +774,7 @@ void FGPiston::doOilPressure(void)
 {
   double Oil_Press_Relief_Valve = 60; // FIXME: may vary by engine
   double Oil_Press_RPM_Max = MaxRPM * 0.75;    // 75% of max rpm FIXME: may vary by engine
-  double Design_Oil_Temp = 358;              // degK; FIXME: may vary by engine
+  double Design_Oil_Temp = 358;          // degK; FIXME: may vary by engine
   double Oil_Viscosity_Index = 0.25;
 
   OilPressure_psi = (Oil_Press_Relief_Valve / Oil_Press_RPM_Max) * RPM;

diff --git a/src/FDM/JSBSim/models/propulsion/FGTank.cpp b/src/FDM/JSBSim/models/propulsion/FGTank.cpp
index 7f6d411b1e73def508e345db98f1ee04bb80c288..9827c5606b7758ccfebb4d25c1acac4d870df83c 100644 (file)
--- a/src/FDM/JSBSim/models/propulsion/FGTank.cpp
+++ b/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 {
 

diff --git a/src/FDM/JSBSim/models/propulsion/FGTank.h b/src/FDM/JSBSim/models/propulsion/FGTank.h
index 9fbce75b8057ce29a27a6a1f44e64b1f5f5b82f1..f9bb0332f55b88a2252c4141616374d55db35e3f 100644 (file)
--- a/src/FDM/JSBSim/models/propulsion/FGTank.h
+++ b/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);