diff --git a/src/FDM/IO360.cxx b/src/FDM/IO360.cxx index a9b5540db..84120252d 100644 --- a/src/FDM/IO360.cxx +++ b/src/FDM/IO360.cxx @@ -668,7 +668,7 @@ void FGNewEngine::Do_Prop_Calcs() //cout << "RPM = " << RPM << '\n'; //cout << "angular_velocity_SI = " << angular_velocity_SI << '\n'; - prop_power_consumed_SI = Cp * rho_air * pow(FGProp1_RPS,3.0) * pow(prop_diameter,5.0); + prop_power_consumed_SI = Cp * rho_air * pow(FGProp1_RPS,3.0f) * pow(float(prop_diameter),5.0f); //cout << "prop HP consumed = " << prop_power_consumed_SI / 745.699 << '\n'; if(angular_velocity_SI == 0) prop_torque = 0; diff --git a/src/FDM/JSBSim/FGTable.cpp b/src/FDM/JSBSim/FGTable.cpp index 103e7e0f0..48c4877b1 100644 --- a/src/FDM/JSBSim/FGTable.cpp +++ b/src/FDM/JSBSim/FGTable.cpp @@ -225,7 +225,7 @@ void FGTable::Print(void) } cout << endl; } - cout.setf(0, ios::floatfield); // reset + cout.setf((ios_base::fmtflags)0, ios::floatfield); // reset } //%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% diff --git a/src/FDM/UIUCModel/uiuc_aircraft.h b/src/FDM/UIUCModel/uiuc_aircraft.h index 6d407f8a3..ff22a2b8d 100644 --- a/src/FDM/UIUCModel/uiuc_aircraft.h +++ b/src/FDM/UIUCModel/uiuc_aircraft.h @@ -125,9 +125,7 @@ SG_USING_STD(map); #if !defined (SG_HAVE_NATIVE_SGI_COMPILERS) SG_USING_STD(iostream); #endif -#if defined ( macintosh ) || defined ( _MSC_VER ) SG_USING_STD(ofstream); -#endif typedef stack :: iterator LIST; diff --git a/src/Objects/obj.cxx b/src/Objects/obj.cxx index 166111169..4fb53463c 100644 --- a/src/Objects/obj.cxx +++ b/src/Objects/obj.cxx @@ -381,11 +381,7 @@ ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, while ( ! in.eof() ) { #endif -#if defined( macintosh ) || defined( _MSC_VER ) in >> ::skipws; -#else - in >> skipws; -#endif if ( in.get( c ) && c == '#' ) { // process a comment line @@ -628,11 +624,7 @@ ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, // read all subsequent numbers until next thing isn't a number while ( true ) { -#if defined( macintosh ) || defined( _MSC_VER ) in >> ::skipws; -#else - in >> skipws; -#endif char c; in.get(c); @@ -740,11 +732,7 @@ ssgBranch *fgAsciiObjLoad( const string& path, FGTileEntry *t, // eat white space before start of while loop so if we are // done with useful input it is noticed before hand. -#if defined( macintosh ) || defined( _MSC_VER ) in >> ::skipws; -#else - in >> skipws; -#endif } }