remove macintosh (note: not MacOS-X) and MWERKS workarounds.

diff --git a/src/FDM/JSBSim/FGFDMExec.cpp b/src/FDM/JSBSim/FGFDMExec.cpp
index 3bf7c700bbf749809f89ef455781981fd447ebfd..2d5d409faf8006bb3470007cde5118a7cd5dc9fd 100644 (file)
--- 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 aa287f0d4656d3cdb2f9b69c396e7ab00d46b7f1..a6b1d7e0f84c44ee1595c7e9a3df195c87b198a6 100644 (file)
--- 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 bbfebe7ce78824d3312e428fb1f6a8882c8dd83a..eedec934590db45e4c1e1c6382ebb5151fb69d0a 100644 (file)
--- 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 0797b69fcd154b5d912b7edc712b68099d9b4e46..7d2178433b85a7589d01e3deaa407c57dd2718f2 100644 (file)
--- 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 e946a5b479defc2fb9315aacc1387fec30eca466..ccad749f341a3d8ce3bed2934059cb541e2e16dc 100644 (file)
--- 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 505c803468debdcd029dcde924837ce29de53a86..2bb3623c75f7a1725ce92a9a2ccbbc5bc0187449 100644 (file)
--- 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 8dd5fc8f818ba5e9f176576be660fa1b3c3ff43f..0262e0872ed26698d379215667e58c9e2e95b0bb 100644 (file)
--- 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 7da464e0e455b1cfbec652bb64adaf6cf3dfcbc1..c84433c99805785132486bb0de5712af0d2f6162 100644 (file)
--- 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 7a0d6f15660ffb65393682cf62f6a4b7aee81179..1ccb7c7422e67875fd92d34046259ba8a55f6518 100644 (file)
--- 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 bcca56cb7462775a3c31051a131763e505328731..cededea8bfbb3db90e0951d8e6efa716cb91814d 100644 (file)
--- 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 9617286dc732d4164dfa40acdb8b717d53a1a389..c53d3a1c1a75e880b7fdaebfc37d5bd799ebe2e4 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu.cpp
@@ -159,11 +159,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_CD.cpp b/src/FDM/UIUCModel/uiuc_menu_CD.cpp
index 393ce4ff1b79983be9ffd28dfe5e8daf8aee9659..345fa06c4c8b8955b2dc196b210ece70de5ab06c 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_CD.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_CD.cpp
@@ -72,11 +72,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_CL.cpp b/src/FDM/UIUCModel/uiuc_menu_CL.cpp
index bbadeca97da3ecb3d4a0e48a2a79ad9fba622837..ff16c2444d939b423601d2e0f450f36f1360c2ab 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_CL.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_CL.cpp
@@ -72,11 +72,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_CY.cpp b/src/FDM/UIUCModel/uiuc_menu_CY.cpp
index 605a1247a899d25ea1e65f4ac8a37792f151e19d..f0dd8e9e6b7dca7fab5d5838bc2000f2b8b46051 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_CY.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_CY.cpp
@@ -72,11 +72,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_Cm.cpp b/src/FDM/UIUCModel/uiuc_menu_Cm.cpp
index d356b00f49a9e71daede2536a4c90f07d7629dcf..bbd17a7742a7d2ea807a10d000234dc794113432 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_Cm.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_Cm.cpp
@@ -72,11 +72,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_Cn.cpp b/src/FDM/UIUCModel/uiuc_menu_Cn.cpp
index db0d622009589ebc3304892014702724a4c89cb6..38f4cb9616aadc136e37ceb9fc2feae8372f1d11 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_Cn.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_Cn.cpp
@@ -72,11 +72,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_Croll.cpp b/src/FDM/UIUCModel/uiuc_menu_Croll.cpp
index 7b65fee04d2f3151f95915ccd046425fba4364c6..36b52c1c05730b5572ccd24f3af7af3c643851b8 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_Croll.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_Croll.cpp
@@ -72,11 +72,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp b/src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp
index 256e8bada549332522315da80fe9db5292e2bb58..f19533111def2e24a5739857db69e0eb6adf94cd 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_controlSurface.cpp
@@ -72,11 +72,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_engine.cpp b/src/FDM/UIUCModel/uiuc_menu_engine.cpp
index e3d0eb00a71837850eebb8c3dd5418bb967ec56c..e42867c8fb83e24c5d018e5301c47c646a8ec10f 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_engine.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_engine.cpp
@@ -72,11 +72,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_fog.cpp b/src/FDM/UIUCModel/uiuc_menu_fog.cpp
index 2472e43a3fd50361b94571931b8aaeb7ed78333e..81a689684940716606061734d397a43e18755f2a 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_fog.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_fog.cpp
@@ -72,11 +72,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_gear.cpp b/src/FDM/UIUCModel/uiuc_menu_gear.cpp
index 30bdc13571bf4ede9437d6e0583a40dc2302fd60..994f7c07a8f40c0b4bef61460facb918576ac3f4 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_gear.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_gear.cpp
@@ -72,11 +72,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_geometry.cpp b/src/FDM/UIUCModel/uiuc_menu_geometry.cpp
index 550d9d6cbeca88f8fb28ece18f725068d685b693..e6d808e1b8c996c210919d788f0043e942b29ec4 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_geometry.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_geometry.cpp
@@ -72,11 +72,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_ice.cpp b/src/FDM/UIUCModel/uiuc_menu_ice.cpp
index 4c7b4d317c3bbe8b22e118231f80f58382a70241..fc17682da7ace70b13e3159585b962f57883c742 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_ice.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_ice.cpp
@@ -72,11 +72,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_init.cpp b/src/FDM/UIUCModel/uiuc_menu_init.cpp
index a331955253d778cc2fee1a53385c21910c815c74..2884eeedb16fd22aa1f0c30eec6f6649528ef052 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_init.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_init.cpp
@@ -73,11 +73,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_mass.cpp b/src/FDM/UIUCModel/uiuc_menu_mass.cpp
index bbd93116024fa83eae5e38b1ef34f2431dbb3d52..df45eff979bf021956e34703d7ebd6b1cce12f7a 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_mass.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_mass.cpp
@@ -72,11 +72,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_misc.cpp b/src/FDM/UIUCModel/uiuc_menu_misc.cpp
index 2720d712abba1ede5dbf93a5570eeace0e4d5dc4..cc2a270cb369a7ea1dc8752b489a1cfd004cc6e0 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_misc.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_misc.cpp
@@ -72,11 +72,6 @@
 
 #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>

diff --git a/src/FDM/UIUCModel/uiuc_menu_record.cpp b/src/FDM/UIUCModel/uiuc_menu_record.cpp
index c89a990d8ce56a9ea7d1dabfff5816cd00bcc803..0634a8848276c545bf379bc4785a4f50bf4c7f56 100644 (file)
--- a/src/FDM/UIUCModel/uiuc_menu_record.cpp
+++ b/src/FDM/UIUCModel/uiuc_menu_record.cpp
@@ -75,11 +75,6 @@
 
 #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>