Goodbye automake.

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

diff --git a/src/FDM/UIUCModel/uiuc_menu_geometry.cpp b/src/FDM/UIUCModel/uiuc_menu_geometry.cpp
index 09d8100d9ce66e03cb34e831f9ca8aa904369e59..e9050e81f42d3236c12daa3eb4926ccb2d732018 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_geometry.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_geometry.cpp
@@ -66,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,
@@ -173,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;
        }