21.12.1999 Christian Mayer: Added a fix for compatibility to gcc 2.8 which

suggested by Oliver Delise.

diff --git a/src/WeatherCM/FGTurbulenceItem.h b/src/WeatherCM/FGTurbulenceItem.h
index 8818eb94c057464de4bba56084db26e99b7872ff..ffec9550323a3365940a42281be72e99301841a6 100644 (file)
--- a/src/WeatherCM/FGTurbulenceItem.h
+++ b/src/WeatherCM/FGTurbulenceItem.h
@@ -36,6 +36,8 @@ HISTORY
                                suggestion
 19.10.1999 Christian Mayer     change to use PLIB's sg instead of Point[2/3]D
                                and lots of wee code cleaning
+21.12.1999 Christian Mayer     Added a fix for compatibility to gcc 2.8 which
+                               suggested by Oliver Delise
 *****************************************************************************/
 
 /****************************************************************************/
@@ -68,6 +70,12 @@ HISTORY
 class FGTurbulenceItem;
 FGTurbulenceItem operator-(const FGTurbulenceItem& arg);
 
+#if ( __GNU_C__ == 2 && __GNU_MAJOR__ < 9 )
+#  define const_sgVec3 const sgVec3
+#else
+#  define const_sgVec3 const sgVec3&
+#endif
+
 /****************************************************************************/
 /* CLASS DECLARATION                                                       */
 /****************************************************************************/
@@ -78,7 +86,7 @@ private:
 
 protected:
 public:
-    FGTurbulenceItem(const sgVec3& v)  { sgCopyVec3(value, v);}
+    FGTurbulenceItem(const_sgVec3 v)   { sgCopyVec3(value, v);}
     FGTurbulenceItem()                 { sgZeroVec3(value);   }
 
     void          getValue(sgVec3 ret) const { sgCopyVec3(ret, value); };

diff --git a/src/WeatherCM/FGWeatherVectorWrap.h b/src/WeatherCM/FGWeatherVectorWrap.h
index 76b3f95fd26a0650ced0c2a232a2cd75b700adfb..68f47fcb616fcb89901c25b8c1e54e80769dd607 100644 (file)
--- a/src/WeatherCM/FGWeatherVectorWrap.h
+++ b/src/WeatherCM/FGWeatherVectorWrap.h
@@ -32,6 +32,8 @@ HISTORY
 18.10.1999 Christian Mayer     Created
 19.10.1999 Christian Mayer     change to use PLIB's sg instead of Point[2/3]D
                                and lots of wee code cleaning
+21.12.1999 Christian Mayer     Added a fix for compatibility to gcc 2.8 which
+                               suggested by Oliver Delise
 *****************************************************************************/
 
 /****************************************************************************/
@@ -48,12 +50,18 @@ HISTORY
 /****************************************************************************/
 /* DEFINES                                                                 */
 /****************************************************************************/
+#if ( __GNU_C__ == 2 && __GNU_MAJOR__ < 9 )
+#  define const_sgVec2 const sgVec2
+#else
+#  define const_sgVec2 const sgVec2&
+#endif
+
 struct sgVec2Wrap
 {
     sgVec2 p;
 
     sgVec2Wrap();
-    sgVec2Wrap( const sgVec2& src ) { sgCopyVec2( p, src ); }
+    sgVec2Wrap( const_sgVec2 src ) { sgCopyVec2( p, src ); }
 };
 
 #endif /*FGWeatherVectorWrap_H*/

diff --git a/src/WeatherCM/FGWindItem.h b/src/WeatherCM/FGWindItem.h
index ceffd6d025eece661ac72bf1c19124e1102b43dc..0a745e02c2ca4385797ef515db5061f3e28efc18 100644 (file)
--- a/src/WeatherCM/FGWindItem.h
+++ b/src/WeatherCM/FGWindItem.h
@@ -36,6 +36,8 @@ HISTORY
                                suggestion
 19.10.1999 Christian Mayer     change to use PLIB's sg instead of Point[2/3]D
                                and lots of wee code cleaning
+21.12.1999 Christian Mayer     Added a fix for compatibility to gcc 2.8 which
+                               suggested by Oliver Delise
 *****************************************************************************/
 
 /****************************************************************************/
@@ -68,6 +70,12 @@ HISTORY
 class FGWindItem;
 FGWindItem operator-(const FGWindItem& arg);
 
+#if ( __GNU_C__ == 2 && __GNU_MAJOR__ < 9 )
+#  define const_sgVec3 const sgVec3
+#else
+#  define const_sgVec3 const sgVec3&
+#endif
+
 /****************************************************************************/
 /* CLASS DECLARATION                                                       */
 /****************************************************************************/
@@ -79,7 +87,7 @@ private:
 protected:
 public:
 
-    FGWindItem(const sgVec3& v)        { sgCopyVec3(value, v); }
+    FGWindItem(const_sgVec3 v) { sgCopyVec3(value, v); }
     FGWindItem(const WeatherPrecision x, const WeatherPrecision y, const WeatherPrecision z)   
                                { sgSetVec3 (value, x, y, z); }
     FGWindItem()               { sgZeroVec3(value);    }