From 4b40e725cd40d8c9a5ba3230e0bc8654e179bfc1 Mon Sep 17 00:00:00 2001 From: ehofman Date: Thu, 24 Jul 2008 19:50:58 +0000 Subject: [PATCH] remove macintosh (note: not MacOS-X) and MWERKS workarounds. --- src/FDM/JSBSim/FGFDMExec.cpp | 4 ---- src/FDM/JSBSim/JSBSim.cxx | 1 + src/FDM/JSBSim/initialization/FGInitialCondition.cpp | 4 ---- src/FDM/JSBSim/input_output/FGfdmSocket.cpp | 2 -- src/FDM/JSBSim/models/FGAerodynamics.cpp | 3 --- src/FDM/JSBSim/models/FGBuoyantForces.cpp | 3 --- src/FDM/JSBSim/models/FGFCS.cpp | 9 --------- src/FDM/JSBSim/models/FGOutput.cpp | 3 --- src/FDM/JSBSim/models/FGPropulsion.cpp | 6 ------ src/FDM/JSBSim/models/propulsion/FGEngine.cpp | 4 ---- src/FDM/UIUCModel/uiuc_menu.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_CD.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_CL.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_CY.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_Cm.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_Cn.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_Croll.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_engine.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_fog.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_gear.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_geometry.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_ice.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_init.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_mass.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_misc.cpp | 5 ----- src/FDM/UIUCModel/uiuc_menu_record.cpp | 5 ----- 27 files changed, 1 insertion(+), 123 deletions(-) diff --git a/src/FDM/JSBSim/FGFDMExec.cpp b/src/FDM/JSBSim/FGFDMExec.cpp index 3bf7c700b..2d5d409fa 100644 --- a/src/FDM/JSBSim/FGFDMExec.cpp +++ b/src/FDM/JSBSim/FGFDMExec.cpp @@ -479,10 +479,6 @@ bool FGFDMExec::LoadModel(string model, bool addModelToPath) modelName = model; // Set the class modelName attribute -# ifdef macintosh - separator = ";"; -# endif - if( AircraftPath.empty() || EnginePath.empty() || SystemsPath.empty()) { cerr << "Error: attempted to load aircraft with undefined "; cerr << "aircraft, engine, and system paths" << endl; diff --git a/src/FDM/JSBSim/JSBSim.cxx b/src/FDM/JSBSim/JSBSim.cxx index aa287f0d4..a6b1d7e0f 100644 --- a/src/FDM/JSBSim/JSBSim.cxx +++ b/src/FDM/JSBSim/JSBSim.cxx @@ -311,6 +311,7 @@ void FGJSBsim::init() 9.0/5.0*(temperature->getDoubleValue()+273.15) ); Atmosphere->SetExPressure(pressure->getDoubleValue()*70.726566); Atmosphere->SetExDensity(density->getDoubleValue()); + Atmosphere->SetTurbType(FGAtmosphere::ttCulp); Atmosphere->SetTurbGain(turbulence_gain->getDoubleValue()); Atmosphere->SetTurbRate(turbulence_rate->getDoubleValue()); diff --git a/src/FDM/JSBSim/initialization/FGInitialCondition.cpp b/src/FDM/JSBSim/initialization/FGInitialCondition.cpp index bbfebe7ce..eedec9345 100644 --- a/src/FDM/JSBSim/initialization/FGInitialCondition.cpp +++ b/src/FDM/JSBSim/initialization/FGInitialCondition.cpp @@ -826,10 +826,6 @@ bool FGInitialCondition::Load(string rstfile, bool useStoredPath) int n; string sep = "/"; -# ifdef macintosh - sep = ";"; -# endif - if( useStoredPath ) { init_file_name = fdmex->GetFullAircraftPath() + sep + rstfile + ".xml"; } else { diff --git a/src/FDM/JSBSim/input_output/FGfdmSocket.cpp b/src/FDM/JSBSim/input_output/FGfdmSocket.cpp index 0797b69fc..7d2178433 100644 --- a/src/FDM/JSBSim/input_output/FGfdmSocket.cpp +++ b/src/FDM/JSBSim/input_output/FGfdmSocket.cpp @@ -205,10 +205,8 @@ FGfdmSocket::FGfdmSocket(int port) FGfdmSocket::~FGfdmSocket() { - #ifndef macintosh if (sckt) shutdown(sckt,2); if (sckt_in) shutdown(sckt_in,2); - #endif #ifdef __BORLANDC__ WSACleanup(); diff --git a/src/FDM/JSBSim/models/FGAerodynamics.cpp b/src/FDM/JSBSim/models/FGAerodynamics.cpp index e946a5b47..ccad749f3 100644 --- a/src/FDM/JSBSim/models/FGAerodynamics.cpp +++ b/src/FDM/JSBSim/models/FGAerodynamics.cpp @@ -308,9 +308,6 @@ bool FGAerodynamics::Load(Element *element) Element *temp_element, *axis_element, *function_element; string separator = "/"; -#ifdef macintosh - separator = ";"; -#endif fname = element->GetAttributeValue("file"); if (!fname.empty()) { diff --git a/src/FDM/JSBSim/models/FGBuoyantForces.cpp b/src/FDM/JSBSim/models/FGBuoyantForces.cpp index 505c80346..2bb3623c7 100644 --- a/src/FDM/JSBSim/models/FGBuoyantForces.cpp +++ b/src/FDM/JSBSim/models/FGBuoyantForces.cpp @@ -116,9 +116,6 @@ bool FGBuoyantForces::Load(Element *element) Debug(2); string separator = "/"; -#ifdef macintosh - separator = ";"; -#endif fname = element->GetAttributeValue("file"); if (!fname.empty()) { diff --git a/src/FDM/JSBSim/models/FGFCS.cpp b/src/FDM/JSBSim/models/FGFCS.cpp index 8dd5fc8f8..0262e0872 100644 --- a/src/FDM/JSBSim/models/FGFCS.cpp +++ b/src/FDM/JSBSim/models/FGFCS.cpp @@ -494,9 +494,6 @@ bool FGFCS::Load(Element* el, SystemType systype) Components=0; string separator = "/"; -#ifdef macintosh - separator = ";"; -#endif // ToDo: The handling of name and file attributes could be improved, here, // considering that a name can be in the external file, as well. @@ -649,9 +646,6 @@ string FGFCS::FindSystemFullPathname(string system_filename) ifstream system_file; string separator = "/"; -# ifdef macintosh - separator = ";"; -# endif fullpath = systemPath + separator; localpath = aircraftPath + separator + "Systems" + separator; @@ -680,9 +674,6 @@ ifstream* FGFCS::FindSystemFile(string system_filename) ifstream* system_file = new ifstream(); string separator = "/"; -# ifdef macintosh - separator = ";"; -# endif fullpath = systemPath + separator; localpath = aircraftPath + separator + "Systems" + separator; diff --git a/src/FDM/JSBSim/models/FGOutput.cpp b/src/FDM/JSBSim/models/FGOutput.cpp index 7da464e0e..c84433c99 100644 --- a/src/FDM/JSBSim/models/FGOutput.cpp +++ b/src/FDM/JSBSim/models/FGOutput.cpp @@ -885,9 +885,6 @@ bool FGOutput::Load(Element* element) Element *property_element; string separator = "/"; -# ifdef macintosh - separator = ";"; -# endif if (!DirectivesFile.empty()) { // A directives filename from the command line overrides output_file_name = DirectivesFile; // one found in the config file. diff --git a/src/FDM/JSBSim/models/FGPropulsion.cpp b/src/FDM/JSBSim/models/FGPropulsion.cpp index 7a0d6f156..1ccb7c742 100644 --- a/src/FDM/JSBSim/models/FGPropulsion.cpp +++ b/src/FDM/JSBSim/models/FGPropulsion.cpp @@ -336,9 +336,6 @@ string FGPropulsion::FindEngineFullPathname(string engine_filename) ifstream engine_file; string separator = "/"; -# ifdef macintosh - separator = ";"; -# endif fullpath = enginePath + separator; localpath = aircraftPath + separator + "Engines" + separator; @@ -367,9 +364,6 @@ ifstream* FGPropulsion::FindEngineFile(string engine_filename) ifstream* engine_file = new ifstream(); string separator = "/"; -# ifdef macintosh - separator = ";"; -# endif fullpath = enginePath + separator; localpath = aircraftPath + separator + "Engines" + separator; diff --git a/src/FDM/JSBSim/models/propulsion/FGEngine.cpp b/src/FDM/JSBSim/models/propulsion/FGEngine.cpp index bcca56cb7..cededea8b 100644 --- a/src/FDM/JSBSim/models/propulsion/FGEngine.cpp +++ b/src/FDM/JSBSim/models/propulsion/FGEngine.cpp @@ -254,10 +254,6 @@ bool FGEngine::LoadThruster(Element *thruster_element) FGColumnVector3 location, orientation; string separator = "/"; -# ifdef macintosh - separator = ";"; -# endif - fullpath = enginePath + separator; localpath = aircraftPath + separator + "Engines" + separator; diff --git a/src/FDM/UIUCModel/uiuc_menu.cpp b/src/FDM/UIUCModel/uiuc_menu.cpp index 9617286dc..c53d3a1c1 100644 --- a/src/FDM/UIUCModel/uiuc_menu.cpp +++ b/src/FDM/UIUCModel/uiuc_menu.cpp @@ -159,11 +159,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_CD.cpp b/src/FDM/UIUCModel/uiuc_menu_CD.cpp index 393ce4ff1..345fa06c4 100644 --- a/src/FDM/UIUCModel/uiuc_menu_CD.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_CD.cpp @@ -72,11 +72,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_CL.cpp b/src/FDM/UIUCModel/uiuc_menu_CL.cpp index bbadeca97..ff16c2444 100644 --- a/src/FDM/UIUCModel/uiuc_menu_CL.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_CL.cpp @@ -72,11 +72,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_CY.cpp b/src/FDM/UIUCModel/uiuc_menu_CY.cpp index 605a1247a..f0dd8e9e6 100644 --- a/src/FDM/UIUCModel/uiuc_menu_CY.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_CY.cpp @@ -72,11 +72,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_Cm.cpp b/src/FDM/UIUCModel/uiuc_menu_Cm.cpp index d356b00f4..bbd17a774 100644 --- a/src/FDM/UIUCModel/uiuc_menu_Cm.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_Cm.cpp @@ -72,11 +72,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_Cn.cpp b/src/FDM/UIUCModel/uiuc_menu_Cn.cpp index db0d62200..38f4cb961 100644 --- a/src/FDM/UIUCModel/uiuc_menu_Cn.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_Cn.cpp @@ -72,11 +72,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_Croll.cpp b/src/FDM/UIUCModel/uiuc_menu_Croll.cpp index 7b65fee04..36b52c1c0 100644 --- a/src/FDM/UIUCModel/uiuc_menu_Croll.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_Croll.cpp @@ -72,11 +72,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp b/src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp index 256e8bada..f19533111 100644 --- a/src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp @@ -72,11 +72,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_engine.cpp b/src/FDM/UIUCModel/uiuc_menu_engine.cpp index e3d0eb00a..e42867c8f 100644 --- a/src/FDM/UIUCModel/uiuc_menu_engine.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_engine.cpp @@ -72,11 +72,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_fog.cpp b/src/FDM/UIUCModel/uiuc_menu_fog.cpp index 2472e43a3..81a689684 100644 --- a/src/FDM/UIUCModel/uiuc_menu_fog.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_fog.cpp @@ -72,11 +72,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_gear.cpp b/src/FDM/UIUCModel/uiuc_menu_gear.cpp index 30bdc1357..994f7c07a 100644 --- a/src/FDM/UIUCModel/uiuc_menu_gear.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_gear.cpp @@ -72,11 +72,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_geometry.cpp b/src/FDM/UIUCModel/uiuc_menu_geometry.cpp index 550d9d6cb..e6d808e1b 100644 --- a/src/FDM/UIUCModel/uiuc_menu_geometry.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_geometry.cpp @@ -72,11 +72,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_ice.cpp b/src/FDM/UIUCModel/uiuc_menu_ice.cpp index 4c7b4d317..fc17682da 100644 --- a/src/FDM/UIUCModel/uiuc_menu_ice.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_ice.cpp @@ -72,11 +72,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_init.cpp b/src/FDM/UIUCModel/uiuc_menu_init.cpp index a33195525..2884eeedb 100644 --- a/src/FDM/UIUCModel/uiuc_menu_init.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_init.cpp @@ -73,11 +73,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_mass.cpp b/src/FDM/UIUCModel/uiuc_menu_mass.cpp index bbd931160..df45eff97 100644 --- a/src/FDM/UIUCModel/uiuc_menu_mass.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_mass.cpp @@ -72,11 +72,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_misc.cpp b/src/FDM/UIUCModel/uiuc_menu_misc.cpp index 2720d712a..cc2a270cb 100644 --- a/src/FDM/UIUCModel/uiuc_menu_misc.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_misc.cpp @@ -72,11 +72,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include diff --git a/src/FDM/UIUCModel/uiuc_menu_record.cpp b/src/FDM/UIUCModel/uiuc_menu_record.cpp index c89a990d8..0634a8848 100644 --- a/src/FDM/UIUCModel/uiuc_menu_record.cpp +++ b/src/FDM/UIUCModel/uiuc_menu_record.cpp @@ -75,11 +75,6 @@ #include -#if defined( __MWERKS__ ) -// -dw- optimizer chokes (big-time) trying to optimize humongous -// loop/switch statements -#pragma optimization_level 0 -#endif #include #include -- 2.39.5