Reset: work with threaded OSG modes

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

diff --git a/src/FDM/UIUCModel/uiuc_menu_init.cpp b/src/FDM/UIUCModel/uiuc_menu_init.cpp
index 40d678975b25d7f354826a20d08055071730e6f0..889ef2eb488ea12f5e574fdafdf07e3ad3f36a5e 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_init.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_init.cpp
@@ -18,6 +18,10 @@
 ----------------------------------------------------------------------
 
  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
+               08/20/2003   (RD) removed old_flap_routine
 
 ----------------------------------------------------------------------
 
@@ -63,31 +67,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_init.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_init( const string& linetoken2, const string& linetoken3,
@@ -97,14 +95,14 @@ void parse_init( const string& linetoken2, const string& linetoken3,
                 const string& linetoken10, const string& aircraft_directory,
                 LIST command_line ) {
     double token_value;
-    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());
     int token_value_recordRate;
 
     switch(init_map[linetoken2])
@@ -471,11 +469,6 @@ void parse_init( const string& linetoken2, const string& linetoken3,
          token4 >> port_num;
          break;
        }
-      case old_flap_routine_flag:
-       {
-         old_flap_routine = true;
-         break;
-       }
       case icing_demo_flag:
        {
          icing_demo = true;