X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FFDM%2FUIUCModel%2Fuiuc_menu_geometry.cpp;h=e9050e81f42d3236c12daa3eb4926ccb2d732018;hb=70b4f38ebccbafea664ed2310eaf990bd2b9edd8;hp=70d4c89f5b42eb9885ec3719ce49898cf565a503;hpb=7289eaa8baafac56a3e32dedd5b77d3534d61c4a;p=flightgear.git

diff --git a/src/FDM/UIUCModel/uiuc_menu_geometry.cpp b/src/FDM/UIUCModel/uiuc_menu_geometry.cpp
index 70d4c89f5..e9050e81f 100644
--- a/src/FDM/UIUCModel/uiuc_menu_geometry.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_geometry.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_geometry.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_geometry( const string& linetoken2, const string& linetoken3,
@@ -97,14 +94,14 @@ void parse_geometry( 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());
 
     switch(geometry_map[linetoken2])
       {
@@ -170,7 +167,7 @@ void parse_geometry( const string& linetoken2, const string& linetoken3,
 	  else
 	    uiuc_warnings_errors(1, *command_line);
 	  
-	  ch = token_value;
+	  chord_h = token_value;
 	  geometryParts -> storeCommands (*command_line);
 	  break;
 	}