Menu
▾
▴
Re: [Flightgear-devel] [Flightgear-commitlogs] FlightGear branch, next, updated. f2d6b76b13d0bf4d96477761b66b5d30b1fcbd26
|
From: Edward d'A. <tru...@gm...> - 2015-03-29 20:33:34
|
Hi James, Your commit to flightgear (0cff350dabddf367a3aadee424d55bee513017a3, "Fix UIUC libc++ compilation") broke something with the ornithopter: """ [edward@localhost ~]$ fgfs --aircraft=ornithopter Error reading properties: mismatched tag at /flightgear/flightgear-fgdata/preferences.xml, line 1262, column 58 (reported by SimGear XML Parser) Enabling ATI viewport hack Starting automatic scenery download/synchronization. Using built-in SVN support. Directory: '/home/edward/.fgfs/TerraSync'. default catalog not found, installing 'org.flightgear.default' from 'http://fgfs.goneabitbursar.com/pkg/3.5.0/default-catalog.xml'. LaRCsim $Revision$, $Date$ Initializing LaRCsim for UIUC models We are using /flightgear/flightgear-fgaddon/Aircraft/ornithopter/aircraft.dat init use_V_rel_wind_2U init use_dyn_on_speed_curve1 init dyn_on_speed 2 UIUC ERROR 1: The value of the coefficient in "init dyn_on_speed 2 " should be of type float [edward@localhost ~]$ """ Should this be fixed in the FDM or the aircraft? Cheers, Edward On 24 March 2015 at 17:50, Flightgear-commitlogs <ma...@hy...> wrote: > The branch, next has been updated > > - Log ----------------------------------------------------------------- > commit f2d6b76b13d0bf4d96477761b66b5d30b1fcbd26 > Author: James Turner > Date: Tue Mar 24 11:11:42 2015 -0500 > > Portability: Fix compile errors on MSVC (cmath) > > From Scott (xDraconian) > > commit 0cff350dabddf367a3aadee424d55bee513017a3 > Author: James Turner > Date: Mon Mar 23 10:05:06 2015 -0500 > > Fix UIUC libc++ compilation. > > > - Summary ------------------------------------------------------------- > > src/AIModel/AIBallistic.hxx | 2 +- > src/AIModel/AICarrier.cxx | 2 +- > src/AIModel/AIEscort.cxx | 2 +- > src/AIModel/AIGroundVehicle.hxx | 2 +- > src/AIModel/AIStatic.cxx | 2 +- > src/AIModel/AIStorm.cxx | 2 +- > src/AIModel/AIThermal.cxx | 2 +- > src/Airports/groundnetwork.cxx | 2 +- > src/Airports/runwayprefs.cxx | 2 +- > src/Environment/environment.cxx | 2 +- > src/Environment/environment_mgr.hxx | 6 +----- > src/Environment/fgwind.cxx | 2 +- > src/Environment/ridge_lift.cxx | 2 +- > src/FDM/UIUCModel/uiuc_menu_functions.cpp | 2 +- > src/FDM/YASim/Math.hpp | 2 +- > src/FDM/flight.hxx | 2 +- > src/Input/fgjs.cxx | 2 +- > src/Instrumentation/airspeed_indicator.cxx | 2 +- > src/Instrumentation/attitude_indicator.cxx | 2 +- > src/Instrumentation/mk_viii.cxx | 2 +- > src/Instrumentation/mrg.cxx | 2 +- > src/Instrumentation/tcas.cxx | 2 +- > src/Main/options.cxx | 6 +++--- > src/Main/util.cxx | 2 +- > src/Network/ATC-Inputs.cxx | 2 +- > src/Network/ATC-Outputs.cxx | 2 +- > src/Radio/antenna.cxx | 2 +- > src/Radio/radio.cxx | 2 +- > src/Sound/voiceplayer.cxx | 2 +- > 29 files changed, 31 insertions(+), 35 deletions(-) > > > - Diff ---------------------------------------------------------------- > > diff --git a/src/AIModel/AIBallistic.hxx b/src/AIModel/AIBallistic.hxx > index e993817..07866c3 100644 > --- a/src/AIModel/AIBallistic.hxx > +++ b/src/AIModel/AIBallistic.hxx > @@ -22,7 +22,7 @@ > #ifndef _FG_AIBALLISTIC_HXX > #define _FG_AIBALLISTIC_HXX > > -#include <math.h> > +#include <cmath> > #include <vector> > #include <simgear/structure/SGSharedPtr.hxx> > #include <simgear/scene/material/mat.hxx> > diff --git a/src/AIModel/AICarrier.cxx b/src/AIModel/AICarrier.cxx > index fae5d26..e863939 100644 > --- a/src/AIModel/AICarrier.cxx > +++ b/src/AIModel/AICarrier.cxx > @@ -28,7 +28,7 @@ > #include <simgear/sg_inlines.h> > #include <simgear/math/sg_geodesy.hxx> > > -#include <math.h> > +#include <cmath> > #include <Main/util.hxx> > > #include "AICarrier.hxx" > diff --git a/src/AIModel/AIEscort.cxx b/src/AIModel/AIEscort.cxx > index 9a81667..44e53c8 100644 > --- a/src/AIModel/AIEscort.cxx > +++ b/src/AIModel/AIEscort.cxx > @@ -30,7 +30,7 @@ > #include <simgear/math/sg_geodesy.hxx> > #include <simgear/math/sg_random.h> > > -#include <math.h> > +#include <cmath> > #include <Main/util.hxx> > #include <Viewer/viewer.hxx> > > diff --git a/src/AIModel/AIGroundVehicle.hxx b/src/AIModel/AIGroundVehicle.hxx > index fcb822a..40cbe19 100644 > --- a/src/AIModel/AIGroundVehicle.hxx > +++ b/src/AIModel/AIGroundVehicle.hxx > @@ -21,7 +21,7 @@ > #ifndef _FG_AIGROUNDVEHICLE_HXX > #define _FG_AIGROUNDVEHICLE_HXX > > -#include <math.h> > +#include <cmath> > #include <vector> > #include <simgear/structure/SGSharedPtr.hxx> > #include <simgear/scene/material/mat.hxx> > diff --git a/src/AIModel/AIStatic.cxx b/src/AIModel/AIStatic.cxx > index 5ac1f4c..5da5707 100644 > --- a/src/AIModel/AIStatic.cxx > +++ b/src/AIModel/AIStatic.cxx > @@ -26,7 +26,7 @@ > #include <Main/globals.hxx> > #include <Scenery/scenery.hxx> > #include <string> > -#include <math.h> > +#include <cmath> > > using std::string; > > diff --git a/src/AIModel/AIStorm.cxx b/src/AIModel/AIStorm.cxx > index e114117..cbb4225 100644 > --- a/src/AIModel/AIStorm.cxx > +++ b/src/AIModel/AIStorm.cxx > @@ -26,7 +26,7 @@ > #include <Main/globals.hxx> > #include <Scenery/scenery.hxx> > #include <string> > -#include <math.h> > +#include <cmath> > #include <cstdlib> > #include <time.h> > > diff --git a/src/AIModel/AIThermal.cxx b/src/AIModel/AIThermal.cxx > index 7007bb2..4e8e63b 100644 > --- a/src/AIModel/AIThermal.cxx > +++ b/src/AIModel/AIThermal.cxx > @@ -28,7 +28,7 @@ > #include <Main/globals.hxx> > #include <Scenery/scenery.hxx> > #include <string> > -#include <math.h> > +#include <cmath> > > using std::string; > > diff --git a/src/Airports/groundnetwork.cxx b/src/Airports/groundnetwork.cxx > index 3c69262..7f82d2d 100644 > --- a/src/Airports/groundnetwork.cxx > +++ b/src/Airports/groundnetwork.cxx > @@ -24,7 +24,7 @@ > # include <config.h> > #endif > > -#include <math.h> > +#include <cmath> > #include <algorithm> > #include <fstream> > #include <map> > diff --git a/src/Airports/runwayprefs.cxx b/src/Airports/runwayprefs.cxx > index e6f1eb6..3353820 100644 > --- a/src/Airports/runwayprefs.cxx > +++ b/src/Airports/runwayprefs.cxx > @@ -25,7 +25,7 @@ > # include <config.h> > #endif > > -#include <math.h> > +#include <cmath> > #include <cstdlib> > #include <cstring> > > diff --git a/src/Environment/environment.cxx b/src/Environment/environment.cxx > index 5707eea..60c7001 100644 > --- a/src/Environment/environment.cxx > +++ b/src/Environment/environment.cxx > @@ -23,7 +23,7 @@ > # include <config.h> > #endif > > -#include <math.h> > +#include <cmath> > > #include <boost/tuple/tuple.hpp> > > diff --git a/src/Environment/environment_mgr.hxx b/src/Environment/environment_mgr.hxx > index edbeb57..08e0b7f 100644 > --- a/src/Environment/environment_mgr.hxx > +++ b/src/Environment/environment_mgr.hxx > @@ -26,11 +26,7 @@ > #include <simgear/structure/subsystem_mgr.hxx> > #include <simgear/props/tiedpropertylist.hxx> > > -#ifdef SG_HAVE_STD_INCLUDES > -# include <cmath> > -#else > -# include <math.h> > -#endif > +#include <cmath> > > class FGEnvironment; > class FGClouds; > diff --git a/src/Environment/fgwind.cxx b/src/Environment/fgwind.cxx > index 43a67c4..687a7ae 100644 > --- a/src/Environment/fgwind.cxx > +++ b/src/Environment/fgwind.cxx > @@ -20,7 +20,7 @@ > // > // $Id$ > #include "fgwind.hxx" > -#include <math.h> > +#include <cmath> > #include <stdio.h> > > FGWindModulator::FGWindModulator() : > diff --git a/src/Environment/ridge_lift.cxx b/src/Environment/ridge_lift.cxx > index 2a26af5..bb46121 100644 > --- a/src/Environment/ridge_lift.cxx > +++ b/src/Environment/ridge_lift.cxx > @@ -35,7 +35,7 @@ > #include <Main/util.hxx> > #include <Scenery/scenery.hxx> > #include <string> > -#include <math.h> > +#include <cmath> > #include <simgear/sg_inlines.h> > > using std::string; > diff --git a/src/FDM/UIUCModel/uiuc_menu_functions.cpp b/src/FDM/UIUCModel/uiuc_menu_functions.cpp > index 131f6c3..5d520ca 100644 > --- a/src/FDM/UIUCModel/uiuc_menu_functions.cpp > +++ b/src/FDM/UIUCModel/uiuc_menu_functions.cpp > @@ -72,7 +72,7 @@ bool check_float( const string &token) > { > float value; > istringstream stream(token.c_str()); > - return (stream >> value); > + return (stream >> value).good(); > } > > void d_2_to_3( double array2D[100][100], double array3D[][100][100], int index3D) > diff --git a/src/FDM/YASim/Math.hpp b/src/FDM/YASim/Math.hpp > index ab1f39b..82bad4c 100644 > --- a/src/FDM/YASim/Math.hpp > +++ b/src/FDM/YASim/Math.hpp > @@ -1,7 +1,7 @@ > #ifndef _MATH_HPP > #define _MATH_HPP > > -#include <math.h> > +#include <cmath> > > namespace yasim { > > diff --git a/src/FDM/flight.hxx b/src/FDM/flight.hxx > index 2d291b3..01ee34c 100644 > --- a/src/FDM/flight.hxx > +++ b/src/FDM/flight.hxx > @@ -73,7 +73,7 @@ > */ > > > -#include <math.h> > +#include <cmath> > > #include <simgear/compiler.h> > #include <simgear/constants.h> > diff --git a/src/Input/fgjs.cxx b/src/Input/fgjs.cxx > index 59effd5..d849f3c 100644 > --- a/src/Input/fgjs.cxx > +++ b/src/Input/fgjs.cxx > @@ -32,7 +32,7 @@ > # include <winsock2.h> > #endif > > -#include <math.h> > +#include <cmath> > > #include <iostream> > #include <fstream> > diff --git a/src/Instrumentation/airspeed_indicator.cxx b/src/Instrumentation/airspeed_indicator.cxx > index 2879f73..7672f75 100644 > --- a/src/Instrumentation/airspeed_indicator.cxx > +++ b/src/Instrumentation/airspeed_indicator.cxx > @@ -8,7 +8,7 @@ > # include "config.h" > #endif > > -#include <math.h> > +#include <cmath> > > #include <simgear/constants.h> > #include <simgear/math/interpolater.hxx> > diff --git a/src/Instrumentation/attitude_indicator.cxx b/src/Instrumentation/attitude_indicator.cxx > index de79e81..3720c2c 100644 > --- a/src/Instrumentation/attitude_indicator.cxx > +++ b/src/Instrumentation/attitude_indicator.cxx > @@ -16,7 +16,7 @@ > #include <string> > #include <sstream> > > -#include <math.h> // fabs() > +#include <cmath> // fabs() > > #include "attitude_indicator.hxx" > #include <Main/fg_props.hxx> > diff --git a/src/Instrumentation/mk_viii.cxx b/src/Instrumentation/mk_viii.cxx > index d14748c..5c18cf0 100644 > --- a/src/Instrumentation/mk_viii.cxx > +++ b/src/Instrumentation/mk_viii.cxx > @@ -58,7 +58,7 @@ > #include <stdio.h> > #include <string.h> > #include <assert.h> > -#include <math.h> > +#include <cmath> > > #include <string> > #include <sstream> > diff --git a/src/Instrumentation/mrg.cxx b/src/Instrumentation/mrg.cxx > index 8a77fc1..3f914b2 100644 > --- a/src/Instrumentation/mrg.cxx > +++ b/src/Instrumentation/mrg.cxx > @@ -17,7 +17,7 @@ > #include <iostream> > #include <string> > #include <sstream> > -#include <math.h> // fabs() > +#include <cmath> // fabs() > > #include <Main/fg_props.hxx> > #include <Main/util.hxx> > diff --git a/src/Instrumentation/tcas.cxx b/src/Instrumentation/tcas.cxx > index 91ec0f2..ce16ce5 100644 > --- a/src/Instrumentation/tcas.cxx > +++ b/src/Instrumentation/tcas.cxx > @@ -91,7 +91,7 @@ > #include <stdio.h> > #include <string.h> > #include <assert.h> > -#include <math.h> > +#include <cmath> > > #include <string> > #include <sstream> > diff --git a/src/Main/options.cxx b/src/Main/options.cxx > index 9b69c16..ee3b3aa 100644 > --- a/src/Main/options.cxx > +++ b/src/Main/options.cxx > @@ -33,10 +33,10 @@ > > #include <boost/foreach.hpp> > > -#include <math.h> // rint() > +#include <cmath> // rint() > #include <stdio.h> > -#include <stdlib.h> // atof(), atoi() > -#include <string.h> // strcmp() > +#include <stdlib.h> // atof(), atoi() > +#include <string.h> // strcmp() > #include <algorithm> > > #include <iostream> > diff --git a/src/Main/util.cxx b/src/Main/util.cxx > index a3ea1b9..4190609 100644 > --- a/src/Main/util.cxx > +++ b/src/Main/util.cxx > @@ -23,7 +23,7 @@ > > #include <simgear/compiler.h> > > -#include <math.h> > +#include <cmath> > > #include <cstdlib> > > diff --git a/src/Network/ATC-Inputs.cxx b/src/Network/ATC-Inputs.cxx > index be59770..0e34f1a 100644 > --- a/src/Network/ATC-Inputs.cxx > +++ b/src/Network/ATC-Inputs.cxx > @@ -37,7 +37,7 @@ > #endif > > #include <errno.h> > -#include <math.h> > +#include <cmath> > #include <cstdio> > > #include <string> > diff --git a/src/Network/ATC-Outputs.cxx b/src/Network/ATC-Outputs.cxx > index dd9e32c..9fa1046 100644 > --- a/src/Network/ATC-Outputs.cxx > +++ b/src/Network/ATC-Outputs.cxx > @@ -38,7 +38,7 @@ > #endif > > #include <errno.h> > -#include <math.h> > +#include <cmath> > > #include <string> > #include <cstdio> > diff --git a/src/Radio/antenna.cxx b/src/Radio/antenna.cxx > index fa5e001..eb74d2f 100644 > --- a/src/Radio/antenna.cxx > +++ b/src/Radio/antenna.cxx > @@ -21,7 +21,7 @@ > # include <config.h> > #endif > > -#include <math.h> > +#include <cmath> > #include <iostream> > #include <stdlib.h> > #include <fstream> > diff --git a/src/Radio/radio.cxx b/src/Radio/radio.cxx > index 62f233e..5fa44f3 100644 > --- a/src/Radio/radio.cxx > +++ b/src/Radio/radio.cxx > @@ -22,7 +22,7 @@ > # include <config.h> > #endif > > -#include <math.h> > +#include <cmath> > > #include <stdlib.h> > #include <deque> > diff --git a/src/Sound/voiceplayer.cxx b/src/Sound/voiceplayer.cxx > index 583443d..ab839cc 100644 > --- a/src/Sound/voiceplayer.cxx > +++ b/src/Sound/voiceplayer.cxx > @@ -33,7 +33,7 @@ > #include <stdio.h> > #include <string.h> > #include <assert.h> > -#include <math.h> > +#include <cmath> > > #include <string> > #include <sstream> > > > ----------------------------------------------------------------------- > > > FlightGear > > ------------------------------------------------------------------------------ > Dive into the World of Parallel Programming The Go Parallel Website, sponsored > by Intel and developed in partnership with Slashdot Media, is your hub for all > things parallel software development, from weekly thought leadership blogs to > news, videos, case studies, tutorials and more. Take a look and join the > conversation now. http://goparallel.sourceforge.net/ > _______________________________________________ > Flightgear-commitlogs mailing list > Fli...@li... > https://lists.sourceforge.net/lists/listinfo/flightgear-commitlogs |