Fix bug 141, by ensuring certain subsystems are assigned to the 'post FDM' group...

[flightgear.git] / src / FDM / YASim / yasim-test.cpp

diff --git a/src/FDM/YASim/yasim-test.cpp b/src/FDM/YASim/yasim-test.cpp
index cff1c1558dbec07683bc5a2fd6bf4d5e43a0a565..f94ab9e74044219d6e1b84fc34f6b8589a3229aa 100644 (file)
--- a/src/FDM/YASim/yasim-test.cpp
+++ b/src/FDM/YASim/yasim-test.cpp
@@ -1,5 +1,8 @@
 #include <stdio.h>
 
+#include <cstring>
+#include <cstdlib>
+
 #include <simgear/props/props.hxx>
 #include <simgear/xml/easyxml.hxx>
 
@@ -7,6 +10,8 @@
 #include "Atmosphere.hpp"
 #include "Airplane.hpp"
 
+#include <simgear/math/SGMath.hxx>
+
 using namespace yasim;
 
 // Stubs.  Not needed by a batch program, but required to link.
@@ -30,11 +35,11 @@ static const float KTS2MPS = 0.514444444444;
 // numbers: "aoa lift drag LD" (aoa in degrees, lift and drag in
 // G's).  You can use this in gnuplot like so (assuming the output is
 // in a file named "dat":
-//
-// plot "dat" using 1:2 with lines title 'lift', \ 
-//      "dat" using 1:3 with lines title 'drag', \ 
-//      "dat" using 1:4 with lines title 'LD'
-//
+/*
+ plot "dat" using 1:2 with lines title 'lift', \ 
+      "dat" using 1:3 with lines title 'drag', \ 
+      "dat" using 1:4 with lines title 'LD'
+*/
 void yasim_graph(Airplane* a, float alt, float kts)
 {
     Model* m = a->getModel();
@@ -82,7 +87,7 @@ int main(int argc, char** argv)
         readXML(file, *fdm);
     } catch (const sg_exception &e) {
         printf("XML parse error: %s (%s)\n",
-               e.getFormattedMessage().c_str(), e.getOrigin().c_str());
+               e.getFormattedMessage().c_str(), e.getOrigin());
     }
 
     // ... and run
@@ -93,8 +98,8 @@ int main(int argc, char** argv)
     if(!a->getFailureMsg() && argc > 2 && strcmp(argv[2], "-g") == 0) {
         float alt = 5000, kts = 100;
         for(int i=3; i<argc; i++) {
-            if     (strcmp(argv[i], "-a") == 0) alt = atof(argv[++i]);
-            else if(strcmp(argv[i], "-s") == 0) kts = atof(argv[++i]);
+            if     (std::strcmp(argv[i], "-a") == 0) alt = std::atof(argv[++i]);
+            else if(std::strcmp(argv[i], "-s") == 0) kts = std::atof(argv[++i]);
             else return usage();
         }
         yasim_graph(a, alt, kts);