Continuing work on ssg-ifying the sky dome.

[flightgear.git] / src / WeatherCM / FGLocalWeatherDatabase.cpp

diff --git a/src/WeatherCM/FGLocalWeatherDatabase.cpp b/src/WeatherCM/FGLocalWeatherDatabase.cpp
index 3e8fadbd10255a2e6099840249ede25fb373dfbe..ba4da125429df2b0e32de198b2c4044fed34f1b1 100644 (file)
--- a/src/WeatherCM/FGLocalWeatherDatabase.cpp
+++ b/src/WeatherCM/FGLocalWeatherDatabase.cpp
@@ -47,8 +47,8 @@ HISTORY
 /****************************************************************************/
 /* INCLUDES                                                                */
 /****************************************************************************/
-#include <Include/compiler.h>
-#include <Include/fg_constants.h>
+#include <simgear/compiler.h>
+#include <simgear/constants.h>
 
 #include <Aircraft/aircraft.hxx>
 
@@ -199,10 +199,18 @@ FGPhysicalProperty FGLocalWeatherDatabase::get(const sgVec3& p) const
     return FGPhysicalProperty(database->Evaluate(p), p[3]);
 }
 
+#ifdef MACOS
+    /* fix a problem with mw compilers in that they don't know the
+       difference between the next two methods. Since the first one
+       doesn't seem to be used anywhere, I commented it out. This is
+       supposed to be fixed in the forthcoming CodeWarrior Release
+       6. */
+#else
 FGPhysicalProperties FGLocalWeatherDatabase::get(const sgVec2& p) const
 {
     return database->Evaluate(p);
 }
+#endif
 
 WeatherPrecision FGLocalWeatherDatabase::getAirDensity(const sgVec3& p) const
 {