Fix many clang errors in UIUC code

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

diff --git a/src/FDM/UIUCModel/uiuc_menu_record.cpp b/src/FDM/UIUCModel/uiuc_menu_record.cpp
index c89a990d8ce56a9ea7d1dabfff5816cd00bcc803..d64188a13fee630dffe5d5b4caad7e8018c22ed2 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_record.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_record.cpp
@@ -49,10 +49,10 @@
 ----------------------------------------------------------------------
 
  CALLS TO:     check_float() if needed
-              d_2_to_3() if needed
-              d_1_to_2() if needed
-              i_1_to_2() if needed
-              d_1_to_1() if needed
+               d_2_to_3() if needed
+               d_1_to_2() if needed
+               i_1_to_2() if needed
+               d_1_to_1() if needed
 
  ----------------------------------------------------------------------
 
@@ -75,32 +75,27 @@
 
 #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_record.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_record( const string& linetoken2, const string& linetoken3,
-                  const string& linetoken4, const string& linetoken5, 
-                  const string& linetoken6, const string& linetoken7, 
-                  const string& linetoken8, const string& linetoken9,
-                  const string& linetoken10, const string& aircraft_directory,
-                  LIST command_line ) {
+                   const string& linetoken4, const string& linetoken5, 
+                   const string& linetoken6, const string& linetoken7, 
+                   const string& linetoken8, const string& linetoken9,
+                   const string& linetoken10, const string& aircraft_directory,
+                   LIST command_line ) {
 
   istringstream token3(linetoken3.c_str());
   istringstream token4(linetoken4.c_str());