Fix many clang errors in UIUC code

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

diff --git a/src/FDM/UIUCModel/uiuc_menu_gear.cpp b/src/FDM/UIUCModel/uiuc_menu_gear.cpp
index 30bdc13571bf4ede9437d6e0583a40dc2302fd60..2d55960a909f80e5fc89bb28a205fbaef50f9814 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_gear.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_gear.cpp
@@ -46,10 +46,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
 
  ----------------------------------------------------------------------
 
@@ -72,32 +72,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_gear.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_gear( 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 ) {
     double token_value;
     istringstream token3(linetoken3.c_str());
     istringstream token4(linetoken4.c_str());
@@ -111,134 +106,134 @@ void parse_gear( const string& linetoken2, const string& linetoken3,
     switch(gear_map[linetoken2])
       {
       case Dx_gear_flag:
-       {
-         int index;
-         token3 >> index;
-         if (index < 0 || index >= 16)
-           uiuc_warnings_errors(1, *command_line);
-         if (check_float(linetoken4))
-           token4 >> token_value;
-         else
-           uiuc_warnings_errors(1, *command_line);
-         D_gear_v[index][0] = token_value;
-         gear_model[index] = true;
-         break;
-       }
+        {
+          int index;
+          token3 >> index;
+          if (index < 0 || index >= 16)
+            uiuc_warnings_errors(1, *command_line);
+          if (check_float(linetoken4))
+            token4 >> token_value;
+          else
+            uiuc_warnings_errors(1, *command_line);
+          D_gear_v[index][0] = token_value;
+          gear_model[index] = true;
+          break;
+        }
       case Dy_gear_flag:
-       {
-         int index;
-         token3 >> index;
-         if (index < 0 || index >= 16)
-           uiuc_warnings_errors(1, *command_line);
-         if (check_float(linetoken4))
-           token4 >> token_value;
-         else
-           uiuc_warnings_errors(1, *command_line);
-         D_gear_v[index][1] = token_value;
-         gear_model[index] = true;
-         break;
-       }
+        {
+          int index;
+          token3 >> index;
+          if (index < 0 || index >= 16)
+            uiuc_warnings_errors(1, *command_line);
+          if (check_float(linetoken4))
+            token4 >> token_value;
+          else
+            uiuc_warnings_errors(1, *command_line);
+          D_gear_v[index][1] = token_value;
+          gear_model[index] = true;
+          break;
+        }
       case Dz_gear_flag:
-       {
-         int index;
-         token3 >> index;
-         if (index < 0 || index >= 16)
-           uiuc_warnings_errors(1, *command_line);
-         if (check_float(linetoken4))
-           token4 >> token_value;
-         else
-           uiuc_warnings_errors(1, *command_line);
-         D_gear_v[index][2] = token_value;
-         gear_model[index] = true;
-         break;
-       }
+        {
+          int index;
+          token3 >> index;
+          if (index < 0 || index >= 16)
+            uiuc_warnings_errors(1, *command_line);
+          if (check_float(linetoken4))
+            token4 >> token_value;
+          else
+            uiuc_warnings_errors(1, *command_line);
+          D_gear_v[index][2] = token_value;
+          gear_model[index] = true;
+          break;
+        }
       case cgear_flag:
-       {
-         int index;
-         token3 >> index;
-         if (index < 0 || index >= 16)
-           uiuc_warnings_errors(1, *command_line);
-         if (check_float(linetoken4))
-           token4 >> token_value;
-         else
-           uiuc_warnings_errors(1, *command_line);
-         cgear[index] = token_value;
-         gear_model[index] = true;
-         break;
-       }
+        {
+          int index;
+          token3 >> index;
+          if (index < 0 || index >= 16)
+            uiuc_warnings_errors(1, *command_line);
+          if (check_float(linetoken4))
+            token4 >> token_value;
+          else
+            uiuc_warnings_errors(1, *command_line);
+          cgear[index] = token_value;
+          gear_model[index] = true;
+          break;
+        }
       case kgear_flag:
-       {
-         int index;
-         token3 >> index;
-         if (index < 0 || index >= 16)
-           uiuc_warnings_errors(1, *command_line);
-         if (check_float(linetoken4))
-           token4 >> token_value;
-         else
-           uiuc_warnings_errors(1, *command_line);
-         kgear[index] = token_value;
-         gear_model[index] = true;
-         break;
-       }
+        {
+          int index;
+          token3 >> index;
+          if (index < 0 || index >= 16)
+            uiuc_warnings_errors(1, *command_line);
+          if (check_float(linetoken4))
+            token4 >> token_value;
+          else
+            uiuc_warnings_errors(1, *command_line);
+          kgear[index] = token_value;
+          gear_model[index] = true;
+          break;
+        }
       case muGear_flag:
-       {
-         int index;
-         token3 >> index;
-         if (index < 0 || index >= 16)
-           uiuc_warnings_errors(1, *command_line);
-         if (check_float(linetoken4))
-           token4 >> token_value;
-         else
-           uiuc_warnings_errors(1, *command_line);
-         muGear[index] = token_value;
-         gear_model[index] = true;
-         break;
-       }
+        {
+          int index;
+          token3 >> index;
+          if (index < 0 || index >= 16)
+            uiuc_warnings_errors(1, *command_line);
+          if (check_float(linetoken4))
+            token4 >> token_value;
+          else
+            uiuc_warnings_errors(1, *command_line);
+          muGear[index] = token_value;
+          gear_model[index] = true;
+          break;
+        }
       case strutLength_flag:
-       {
-         int index;
-         token3 >> index;
-         if (index < 0 || index >= 16)
-           uiuc_warnings_errors(1, *command_line);
-         if (check_float(linetoken4))
-           token4 >> token_value;
-         else
-           uiuc_warnings_errors(1, *command_line);
-         strutLength[index] = token_value;
-         gear_model[index] = true;
-         break;
-       }
+        {
+          int index;
+          token3 >> index;
+          if (index < 0 || index >= 16)
+            uiuc_warnings_errors(1, *command_line);
+          if (check_float(linetoken4))
+            token4 >> token_value;
+          else
+            uiuc_warnings_errors(1, *command_line);
+          strutLength[index] = token_value;
+          gear_model[index] = true;
+          break;
+        }
       case gear_max_flag:
-       {
-         if (check_float(linetoken3))
-           token3 >> token_value;
-         else
-           uiuc_warnings_errors(1, *command_line);
-         
-         use_gear = true;
-         gear_max = token_value;
-         break;
-       }
+        {
+          if (check_float(linetoken3))
+            token3 >> token_value;
+          else
+            uiuc_warnings_errors(1, *command_line);
+          
+          use_gear = true;
+          gear_max = token_value;
+          break;
+        }
       case gear_rate_flag:
-       {
-         if (check_float(linetoken3))
-           token3 >> token_value;
-         else
-           uiuc_warnings_errors(1, *command_line);
-         
-         use_gear = true;
-         gear_rate = token_value;
-         break;
-       }
+        {
+          if (check_float(linetoken3))
+            token3 >> token_value;
+          else
+            uiuc_warnings_errors(1, *command_line);
+          
+          use_gear = true;
+          gear_rate = token_value;
+          break;
+        }
       default:
-       {
-         if (ignore_unknown_keywords) {
-           // do nothing
-         } else {
-           // print error message
-           uiuc_warnings_errors(2, *command_line);
-         }
-         break;
-       }
+        {
+          if (ignore_unknown_keywords) {
+            // do nothing
+          } else {
+            // print error message
+            uiuc_warnings_errors(2, *command_line);
+          }
+          break;
+        }
       };
 }