MSVC compatibility changes and code tweaks for minor nits caught by the

MSVC compiler.

diff --git a/src/Airports/simple.cxx b/src/Airports/simple.cxx
index 6c0911a0c906d1a502267ba4cb4d437e26d7efb9..27d9c9baf720e60a13661006fc88cd8a966cf422 100644 (file)
--- a/src/Airports/simple.cxx
+++ b/src/Airports/simple.cxx
@@ -194,7 +194,7 @@ bool FGAirportsUtil::dump_mk4( const string& file ) {
 
     c4_Row row;
 
-    iterator current = airports.begin();
+    const_iterator current = airports.begin();
     const_iterator end = airports.end();
     while ( current != end ) {
        // add each airport record

diff --git a/src/Cockpit/hud.hxx b/src/Cockpit/hud.hxx
index 8734b1e9c09c6b9c0d9f223a76a7d9f6ab9431de..c6d004d0218d490e12be213c25457e2c0cf18408 100644 (file)
--- a/src/Cockpit/hud.hxx
+++ b/src/Cockpit/hud.hxx
@@ -28,6 +28,8 @@
 # error This library requires C++
 #endif
 
+#include <simgear/compiler.h>
+
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
 #endif

diff --git a/src/Cockpit/panel_io.cxx b/src/Cockpit/panel_io.cxx
index 8e550aee3a01e46d5cf1a699a821d023d0622d5f..3c97c4c8f85f463af630b53d6d65927f40264cc5 100644 (file)
--- a/src/Cockpit/panel_io.cxx
+++ b/src/Cockpit/panel_io.cxx
@@ -638,7 +638,8 @@ readInstrument (SGPropertyNode node, int x, int y, int real_w, int real_h)
   //
   SGPropertyNode action_group = node.getSubNode("actions");
   int nActions = action_group.size();
-  for (int j = 0; j < nActions; j++) {
+  int j;
+  for (j = 0; j < nActions; j++) {
     FGPanelAction * action = readAction(action_group.getChild(j),
                                        hscale, vscale);
     if (action == 0) {
@@ -653,7 +654,7 @@ readInstrument (SGPropertyNode node, int x, int y, int real_w, int real_h)
   //
   SGPropertyNode layer_group = node.getSubNode("layers");
   int nLayers = layer_group.size();
-  for (int j = 0; j < nLayers; j++) {
+  for (j = 0; j < nLayers; j++) {
     FGInstrumentLayer * layer = readLayer(layer_group.getChild(j),
                                          hscale, vscale);
     if (layer == 0) {

diff --git a/src/Controls/controls.hxx b/src/Controls/controls.hxx
index 54405b7619e26a415afd2b09b5d51beef2cd48d9..7c0ba350f771130810e675d21bcc96b557c09ec5 100644 (file)
--- a/src/Controls/controls.hxx
+++ b/src/Controls/controls.hxx
@@ -57,6 +57,8 @@ private:
     double rudder;
     double flaps;
     double throttle[MAX_ENGINES];
+    double mixture[MAX_ENGINES];
+    double prop_advance[MAX_ENGINES];
     double brake[MAX_WHEELS];
     bool throttle_idle;
 
@@ -80,6 +82,10 @@ public:
     inline double get_rudder() const { return rudder; }
     inline double get_flaps() const { return flaps; }
     inline double get_throttle(int engine) const { return throttle[engine]; }
+    inline double get_mixture(int engine) const { return mixture[engine]; }
+    inline double get_prop_advance(int engine) const {
+       return prop_advance[engine];
+    }
     inline double get_brake(int wheel) const { return brake[wheel]; }
 
     // Update functions
@@ -163,6 +169,58 @@ public:
            }
        }
     }
+    inline void set_mixture( int engine, double pos ) {
+       if ( engine == ALL_ENGINES ) {
+           for ( int i = 0; i < MAX_ENGINES; i++ ) {
+               mixture[i] = pos;
+               CLAMP( &mixture[i], 0.0, 1.0 );
+           }
+       } else {
+           if ( (engine >= 0) && (engine < MAX_ENGINES) ) {
+               mixture[engine] = pos;
+               CLAMP( &mixture[engine], 0.0, 1.0 );
+           }
+       }
+    }
+    inline void move_mixture( int engine, double amt ) {
+       if ( engine == ALL_ENGINES ) {
+           for ( int i = 0; i < MAX_ENGINES; i++ ) {
+               mixture[i] += amt;
+               CLAMP( &mixture[i], 0.0, 1.0 );
+           }
+       } else {
+           if ( (engine >= 0) && (engine < MAX_ENGINES) ) {
+               mixture[engine] += amt;
+               CLAMP( &mixture[engine], 0.0, 1.0 );
+           }
+       }
+    }
+    inline void set_prop_advance( int engine, double pos ) {
+       if ( engine == ALL_ENGINES ) {
+           for ( int i = 0; i < MAX_ENGINES; i++ ) {
+               prop_advance[i] = pos;
+               CLAMP( &prop_advance[i], 0.0, 1.0 );
+           }
+       } else {
+           if ( (engine >= 0) && (engine < MAX_ENGINES) ) {
+               prop_advance[engine] = pos;
+               CLAMP( &prop_advance[engine], 0.0, 1.0 );
+           }
+       }
+    }
+    inline void move_prop_advance( int engine, double amt ) {
+       if ( engine == ALL_ENGINES ) {
+           for ( int i = 0; i < MAX_ENGINES; i++ ) {
+               prop_advance[i] += amt;
+               CLAMP( &prop_advance[i], 0.0, 1.0 );
+           }
+       } else {
+           if ( (engine >= 0) && (engine < MAX_ENGINES) ) {
+               prop_advance[engine] += amt;
+               CLAMP( &prop_advance[engine], 0.0, 1.0 );
+           }
+       }
+    }
     inline void set_brake( int wheel, double pos ) {
        if ( wheel == ALL_WHEELS ) {
            for ( int i = 0; i < MAX_WHEELS; i++ ) {

diff --git a/src/FDM/10520d.cxx b/src/FDM/10520d.cxx
index 2a0fcf20a6639ef6b31366c5e790421f8890d917..472ab79a2ad749d9a5fb3e801476089b873de74c 100644 (file)
--- a/src/FDM/10520d.cxx
+++ b/src/FDM/10520d.cxx
@@ -47,11 +47,15 @@
 // INCLUDES
 // ------------------------------------------------------------------------
 
-#include <iostream.h>
+#include <simgear/compiler.h>
+
+#include <iostream>
 #include <math.h>
 
 #include "10520d.hxx"
 
+FG_USING_STD(cout);
+FG_USING_STD(endl);
 
 // ------------------------------------------------------------------------
 // CODE

diff --git a/src/FDM/10520d.hxx b/src/FDM/10520d.hxx
index 082420e6e2d0815c17d3b991b384261329452fe5..954c6e4364a1ee923565c499b5520cd1100bb88c 100644 (file)
--- a/src/FDM/10520d.hxx
+++ b/src/FDM/10520d.hxx
@@ -51,7 +51,7 @@
 #define _10520D_HXX_
 
 
-#include <iostream.h>
+#include <iostream>
 #include <math.h>
 
 

diff --git a/src/FDM/IO360.cxx b/src/FDM/IO360.cxx
index 22e7f97f9d3ccef7cb6559adeb325117968b2f29..64840d0478b56e0aaf4ea31bb11c259d68b8e990 100644 (file)
--- a/src/FDM/IO360.cxx
+++ b/src/FDM/IO360.cxx
@@ -72,12 +72,15 @@
 //
 //////////////////////////////////////////////////////////////////////
 
-#include <iostream.h>
-#include <fstream.h>
+#include <simgear/compiler.h>
+
+#include <iostream>
+#include <fstream>
 #include <math.h>
 
 #include "IO360.hxx"
 
+FG_USING_STD(cout);
 
 // ------------------------------------------------------------------------
 // CODE

diff --git a/src/FDM/IO360.hxx b/src/FDM/IO360.hxx
index 71e63eb917b8f91c8592c409b80f0ce498076268..01fa64c8a7097cf9cc1b10ad5d8f3235c32fba09 100644 (file)
--- a/src/FDM/IO360.hxx
+++ b/src/FDM/IO360.hxx
@@ -56,11 +56,13 @@
 #define PHILS_PROP_MODEL
 #endif 
 
+#include <simgear/compiler.h>
 
-#include <iostream.h>
-#include <fstream.h>
+#include <iostream>
+#include <fstream>
 #include <math.h>
 
+FG_USING_STD(ofstream);
 
 class FGEngine {
 

diff --git a/src/FDM/UIUCModel/uiuc_1DdataFileReader.h b/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
index 1a2018c1a25f2a90b019ba768d18b0cd51dfb640..09973ce74705c8859a83f1347892b80e026e63e2 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
+++ b/src/FDM/UIUCModel/uiuc_1DdataFileReader.h
@@ -1,11 +1,13 @@
 #ifndef _1D_DATA_FILE_READER_H_
 #define _1D_DATA_FILE_READER_H_
 
-#include <strstream.h>
+#include <simgear/compiler.h>
+
+#include <strstream>
+
 #include "uiuc_parsefile.h"
 #include "uiuc_aircraft.h"
 
-
 int uiuc_1DdataFileReader( string file_name, 
                             double x[100], 
                             double y[100], 

diff --git a/src/FDM/UIUCModel/uiuc_2DdataFileReader.h b/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
index c6bec85df71bdf9960c8a161f7a3076f6ddc5096..86a2324df992b2fc9df7abe5c4ee8a33b7e49126 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
+++ b/src/FDM/UIUCModel/uiuc_2DdataFileReader.h
@@ -1,7 +1,10 @@
 #ifndef _2D_DATA_FILE_READER_H_
 #define _2D_DATA_FILE_READER_H_
 
-#include <strstream.h>
+#include <simgear/compiler.h>
+
+#include <strstream>
+
 #include "uiuc_parsefile.h"
 #include "uiuc_aircraft.h"
 

diff --git a/src/FDM/UIUCModel/uiuc_aircraft.h b/src/FDM/UIUCModel/uiuc_aircraft.h
index b05a970cfc65986ad0c86b2f2f7ae0060afe7102..d2a5b601bbf38aeb5868cc26b5c1e0eb82ba46c7 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_aircraft.h
+++ b/src/FDM/UIUCModel/uiuc_aircraft.h
@@ -94,8 +94,11 @@
 #define _AIRCRAFT_H_
 
 #include <simgear/compiler.h>
+
 #include <map>
 #include <iostream>
+#include <math.h>
+
 #include "uiuc_parsefile.h"
 
 FG_USING_STD(map);

diff --git a/src/FDM/UIUCModel/uiuc_controlInput.cpp b/src/FDM/UIUCModel/uiuc_controlInput.cpp
index f4b22682b448674b2e2ea778a774afeba744bb14..e9cfb8eee9e95853f3698ed011d815474c08d838 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_controlInput.cpp
+++ b/src/FDM/UIUCModel/uiuc_controlInput.cpp
@@ -66,7 +66,7 @@
 **********************************************************************/
 
 #include "uiuc_controlInput.h"
-#include <iostream.h>
+#include <iostream>
 
 void uiuc_controlInput()
 {

diff --git a/src/FDM/UIUCModel/uiuc_controlInput.h b/src/FDM/UIUCModel/uiuc_controlInput.h
index 53eadc70f6362e678bd9354c98d46299bc45f0c2..54bc05839a3958e01094a413ba76e0c840c8dcb5 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_controlInput.h
+++ b/src/FDM/UIUCModel/uiuc_controlInput.h
@@ -4,8 +4,15 @@
 #include "uiuc_aircraft.h"
 #include "uiuc_1Dinterpolation.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern double Simtime;
 
+#ifdef __cplusplus
+}
+#endif
 
 void uiuc_controlInput();
 

diff --git a/src/FDM/UIUCModel/uiuc_ice.h b/src/FDM/UIUCModel/uiuc_ice.h
index 18bf1fa8cee2816945e5a7273eb08d0357fea8d4..3fc37e1fe80785bae480b4f321908d4c4834179f 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_ice.h
+++ b/src/FDM/UIUCModel/uiuc_ice.h
@@ -3,8 +3,15 @@
 
 #include "uiuc_aircraft.h"
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern double Simtime;
 
+#ifdef __cplusplus
+}
+#endif
 
 void uiuc_ice_eta();
 

diff --git a/src/FDM/UIUCModel/uiuc_menu.cpp b/src/FDM/UIUCModel/uiuc_menu.cpp
index 04af84ad679b2f204677897f1f5684e017434a8b..016321056e2641c0f6dd07740703a9815cb2d7eb 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu.cpp
@@ -89,8 +89,14 @@
 
 **********************************************************************/
 
+#include <simgear/compiler.h>
+
 #include "uiuc_menu.h"
-#include <iostream.h>
+#include <iostream>
+
+FG_USING_STD(cerr);
+FG_USING_STD(cout);
+FG_USING_STD(endl);
 
 bool check_float(string  &token)
 {

diff --git a/src/FDM/UIUCModel/uiuc_parsefile.h b/src/FDM/UIUCModel/uiuc_parsefile.h
index 8d831cba5658674d43154581be647e027b3c4693..1dea4d449f44918d97c21b8446fa981e4ceae9ca 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_parsefile.h
+++ b/src/FDM/UIUCModel/uiuc_parsefile.h
@@ -1,12 +1,12 @@
 #ifndef _PARSE_FILE_H_
 #define _PARSE_FILE_H_
 
+#include <simgear/compiler.h>
+
 #include <string>
 #include <list>
 #include <fstream>
 
-#include <simgear/compiler.h>
-
 FG_USING_STD(list);
 FG_USING_STD(string);
 FG_USING_STD(ifstream);

diff --git a/src/FDM/UIUCModel/uiuc_recorder.h b/src/FDM/UIUCModel/uiuc_recorder.h
index b532920a59a523f61278d30c6a8bc630cd2f53da..75c262bf78b0f570a852a83588b6a726b58eaaa5 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_recorder.h
+++ b/src/FDM/UIUCModel/uiuc_recorder.h
@@ -8,8 +8,16 @@
 #include <FDM/LaRCsim/ls_cockpit.h>
 #include <FDM/LaRCsim/ls_constants.h>
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 extern double Simtime;
 
+#ifdef __cplusplus
+}
+#endif
+
 void uiuc_recorder(double dt );
 
 #endif //_RECORDER_H

diff --git a/src/FDM/UIUCModel/uiuc_warnings_errors.h b/src/FDM/UIUCModel/uiuc_warnings_errors.h
index 5977b2faa5835376dc7ef3091aeb10bbca031402..8248c00f263de939b50764789af24e5169d1516b 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_warnings_errors.h
+++ b/src/FDM/UIUCModel/uiuc_warnings_errors.h
@@ -1,10 +1,12 @@
 #ifndef _WARNINGS_ERRORS_H_
 #define _WARNINGS_ERRORS_H_
 
+#include <simgear/compiler.h>
+
 #include <string>
 #include <iostream>
 
-using std::string;
+FG_USING_STD(string);
 
 void uiuc_warnings_errors(int errorCode, string line);
 

diff --git a/src/FDM/UIUCModel/uiuc_wrapper.cpp b/src/FDM/UIUCModel/uiuc_wrapper.cpp
index 5867826c44f8ec1cde3fa003f5dbb09ee3bccf47..52a1e3d441877d3dddd9b58d942d17a9f6d1b49f 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_wrapper.cpp
+++ b/src/FDM/UIUCModel/uiuc_wrapper.cpp
@@ -63,6 +63,8 @@
  
 **********************************************************************/
 
+#include <simgear/compiler.h>
+
 #include "uiuc_aircraft.h"
 #include "uiuc_aircraftdir.h"
 #include "uiuc_coefficients.h"
@@ -73,6 +75,9 @@
 #include "uiuc_betaprobe.h"
 #include <FDM/LaRCsim/ls_generic.h>
 
+FG_USING_STD(cout);
+FG_USING_STD(endl);
+
 extern "C" void uiuc_init_aeromodel ();
 extern "C" void uiuc_force_moment(double dt);
 extern "C" void uiuc_engine_routine();

diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx
index 99e916b8043198a25665fd4af422357eb80960c2..c9e43e6f0cf630e7afed01edd55c9035ce584f1e 100644 (file)
--- a/src/FDM/flight.hxx
+++ b/src/FDM/flight.hxx
@@ -949,7 +949,7 @@ public:
     }
 
     inline void add_engine( FGEngInterface e ) {
-       return engines.push_back( e );
+       engines.push_back( e );
     }
 };
 

diff --git a/src/FDM/ps-10520c.cxx b/src/FDM/ps-10520c.cxx
index 78ffb24a9aee1c1b732f1f7a1097d57fca35887c..44c06c8f72912fe4c3936fe5d6cb0b3d7eef6a02 100644 (file)
--- a/src/FDM/ps-10520c.cxx
+++ b/src/FDM/ps-10520c.cxx
@@ -49,10 +49,13 @@
 // INCLUDES
 // ------------------------------------------------------------------------
 
-#include <iostream.h>
-// #include <stdio.h>
+#include <simgear/compiler.h>
+
+#include <iostream>
 #include <math.h>
-// #include "10520c.h"
+
+FG_USING_STD(cout);
+FG_USING_STD(endl);
 
 // ------------------------------------------------------------------------
 // CODE

diff --git a/src/Joystick/joystick.cxx b/src/Joystick/joystick.cxx
index d0227744fbf9fbeb71d98b311268eccf9fbe687c..37e451fa3ea1645270061ce7938bc68fae767dcf 100644 (file)
--- a/src/Joystick/joystick.cxx
+++ b/src/Joystick/joystick.cxx
@@ -21,6 +21,7 @@
 //
 // $Id$
 
+#include <simgear/compiler.h>
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>
@@ -39,7 +40,8 @@
 #include <plib/js.h>
 #include "joystick.hxx"
 
-using std::string;
+FG_USING_STD(string);
+FG_USING_STD(cout);
 
 #ifdef WIN32
 static const int MAX_JOYSTICKS = 2;

diff --git a/src/Main/bfi.cxx b/src/Main/bfi.cxx
index 9c34278ba1a8ea87875152e680dba92fc8062d30..7199fd9ef8604008646f48bc616d5d5f8b5a6e73 100644 (file)
--- a/src/Main/bfi.cxx
+++ b/src/Main/bfi.cxx
@@ -124,7 +124,7 @@ FGBFI::init ()
                               getRoll, setRoll);
 
                                // Engine
-  current_properties.tieDouble("/engine0/rpm",
+  current_properties.tieDouble("/engines/engine0/rpm",
                               getRPM, setRPM);
 
                                // Velocities

diff --git a/src/Main/save.cxx b/src/Main/save.cxx
index 01a771fb13d054d6b5535c98525480315186bfcd..1e0af086ae416da30ea1ec051a30c4e66946de70 100644 (file)
--- a/src/Main/save.cxx
+++ b/src/Main/save.cxx
@@ -20,6 +20,7 @@
 //
 // $Id$
 
+#include <simgear/compiler.h>
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>

diff --git a/src/Main/views.cxx b/src/Main/views.cxx
index 23db806d419bde98fc3e1c13b4e191100a6e6e7e..a183a5de629c6cee32b5c0651abbc2260e9d3e75 100644 (file)
--- a/src/Main/views.cxx
+++ b/src/Main/views.cxx
@@ -21,6 +21,7 @@
 //
 // $Id$
 
+#include <simgear/compiler.h>
 
 #ifdef HAVE_CONFIG_H
 #  include <config.h>

diff --git a/src/Network/props.cxx b/src/Network/props.cxx
index 25c304fd51221814af1aec9d18b53c6a7fb4a1c3..d97dbba9ac87d4dc402ff1fbfbd37d7c635af739 100644 (file)
--- a/src/Network/props.cxx
+++ b/src/Network/props.cxx
@@ -26,10 +26,12 @@
 #include <simgear/io/iochannel.hxx>
 #include <simgear/math/sg_types.hxx>
 
-#include <strstream.h>
+#include <strstream>
 
 #include "props.hxx"
 
+FG_USING_STD(cout);
+FG_USING_STD(istrstream);
 
 FGProps::FGProps() {
 }