Fix for bug 1304 - crash loading XML route

[flightgear.git] / src / FDM / UIUCModel / uiuc_menu_misc.cpp

diff --git a/src/FDM/UIUCModel/uiuc_menu_misc.cpp b/src/FDM/UIUCModel/uiuc_menu_misc.cpp
index c3f67e274576ea995a98e7d20a51c43b22f4851c..2817d24a1c5516f3a80a3f62724c848b0383c6d9 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_misc.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_misc.cpp
@@ -66,31 +66,25 @@
 
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307,
- USA or view http://www.gnu.org/copyleft/gpl.html.
+ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
 **********************************************************************/
 
 #include <simgear/compiler.h>
 
-#if defined( __MWERKS__ )
-// -dw- optimizer chokes (big-time) trying to optimize humongous
-// loop/switch statements
-#pragma optimization_level 0
-#endif
 
 #include <cstdlib>
 #include <string>
-#include STL_IOSTREAM
+#include <iostream>
 
 #include "uiuc_menu_misc.h"
 
-SG_USING_STD(cerr);
-SG_USING_STD(cout);
-SG_USING_STD(endl);
+using std::cerr;
+using std::cout;
+using std::endl;
 
 #ifndef _MSC_VER
-SG_USING_STD(exit);
+using std::exit;
 #endif
 
 void parse_misc( const string& linetoken2, const string& linetoken3,
@@ -121,19 +115,19 @@ void parse_misc( const string& linetoken2, const string& linetoken3,
        simpleHingeMomentCoef = token_value;
        break;
       }
-    case dfTimefdf_flag:
-      {
-       dfTimefdf = linetoken3;
+      //case dfTimefdf_flag:
+      //{
+      //dfTimefdf = linetoken3;
        /* call 1D File Reader with file name (dfTimefdf);
           function returns array of dfs (dfArray) and 
           corresponding time values (TimeArray) and max 
           number of terms in arrays (ndf) */
-       uiuc_1DdataFileReader(dfTimefdf,
-                             dfTimefdf_dfArray,
-                             dfTimefdf_TimeArray,
-                             dfTimefdf_ndf);
-       break;
-      }
+       //uiuc_1DdataFileReader(dfTimefdf,
+       //                    dfTimefdf_dfArray,
+       //                    dfTimefdf_TimeArray,
+       //                    dfTimefdf_ndf);
+       //break;
+      //}
     case flapper_flag:
       {
        string flap_file;