Port over remaining Point3D usage to the more type and unit safe SG* classes.

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

diff --git a/src/FDM/UIUCModel/uiuc_menu_CL.cpp b/src/FDM/UIUCModel/uiuc_menu_CL.cpp
index 772f099910d151573fe412bd8b94faea982c8c05..553d6d689d54506c881bfc467e6bf3244bfbb6ca 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_CL.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_CL.cpp
@@ -18,6 +18,9 @@
 ----------------------------------------------------------------------
 
  HISTORY:      04/04/2003   initial release
+               06/30/2003   (RD) replaced istrstream with istringstream
+                            to get rid of the annoying warning about
+                            using the strstream header
 
 ----------------------------------------------------------------------
 
@@ -63,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_CL.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_CL( const string& linetoken2, const string& linetoken3,
@@ -103,14 +100,14 @@ void parse_CL( const string& linetoken2, const string& linetoken3,
     double datafile_zArray[100][100];
     double convert_f;
     int datafile_nxArray[100], datafile_ny;
-    istrstream token3(linetoken3.c_str());
-    istrstream token4(linetoken4.c_str());
-    istrstream token5(linetoken5.c_str());
-    istrstream token6(linetoken6.c_str());
-    istrstream token7(linetoken7.c_str());
-    istrstream token8(linetoken8.c_str());
-    istrstream token9(linetoken9.c_str());
-    istrstream token10(linetoken10.c_str());
+    istringstream token3(linetoken3.c_str());
+    istringstream token4(linetoken4.c_str());
+    istringstream token5(linetoken5.c_str());
+    istringstream token6(linetoken6.c_str());
+    istringstream token7(linetoken7.c_str());
+    istringstream token8(linetoken8.c_str());
+    istringstream token9(linetoken9.c_str());
+    istringstream token10(linetoken10.c_str());
 
     static bool CZfabetaf_first = true;
     static bool CZfadef_first = true;
@@ -282,14 +279,14 @@ void parse_CL( const string& linetoken2, const string& linetoken3,
          aeroLiftParts -> storeCommands (*command_line);
          
          // additional variables to streamline flap routine in aerodeflections
-         ndf = CLfdf_ndf;
-         int temp_counter = 1;
-         while (temp_counter <= ndf)
-           {
-             dfArray[temp_counter] = CLfdf_dfArray[temp_counter];
-             TimeArray[temp_counter] = dfTimefdf_TimeArray[temp_counter];
-             temp_counter++;
-           }
+         //ndf = CLfdf_ndf;
+         //int temp_counter = 1;
+         //while (temp_counter <= ndf)
+         //  {
+         //    dfArray[temp_counter] = CLfdf_dfArray[temp_counter];
+         //    TimeArray[temp_counter] = dfTimefdf_TimeArray[temp_counter];
+         //    temp_counter++;
+         //  }
          break;
        }
       case CLfadf_flag: