Keep (deprecated) SGTime::update method for a while

allowing dependent projects to adapt.

diff --git a/simgear/compiler.h b/simgear/compiler.h
index e94c7ee40d2f25768f5587e12f9d0f73f39f8ad1..5a1cd47733cf984205be5d8db81e7cc2d809e904 100644 (file)
--- a/simgear/compiler.h
+++ b/simgear/compiler.h
@@ -184,6 +184,12 @@ inline int (isnan)(double r) { return !(r <= 0 || r >= 0); }
 #  define SG_UNIX
 #endif
 
+#if defined( __GNUC__ )
+#  define DEPRECATED __attribute__ ((deprecated))
+#else
+#  define DEPRECATED
+#endif
+
 //
 // No user modifiable definitions beyond here.
 //

diff --git a/simgear/timing/sg_time.cxx b/simgear/timing/sg_time.cxx
index e3b403a05486e2f68a945a5b285364fedd55acc2..9c7cb326ddbea2d3582b336a5b6007a7a25e63ab 100644 (file)
--- a/simgear/timing/sg_time.cxx
+++ b/simgear/timing/sg_time.cxx
@@ -182,6 +182,12 @@ static double sidereal_course( time_t cur_time, const struct tm *gmt, double lng
     return lstTmp;
 }
 
+/** Deprecated method. To be removed after the next release... */
+void SGTime::update( double lon_rad, double lat_rad, time_t ct, long int warp )
+{
+    const SGGeod& location = SGGeod::fromRad(lon_rad, lat_rad);
+    update(location, ct, warp);
+}
 
 // Update the time related variables
 void SGTime::update( const SGGeod& location, time_t ct, long int warp )

diff --git a/simgear/timing/sg_time.hxx b/simgear/timing/sg_time.hxx
index 78d04863811f9b3dff0ae01a57d8eb5e8be40903..d59ee249e223cd196f8de3dc1320c0472c0196f7 100644 (file)
--- a/simgear/timing/sg_time.hxx
+++ b/simgear/timing/sg_time.hxx
@@ -148,6 +148,9 @@ public:
      *        allows us to advance or rewind "time" if we choose to.  */
     void update( const SGGeod& location, time_t ct, long int warp );
 
+    /** Deprecated method. To be removed after the next release... */
+    void update( double lon_rad, double lat_rad, time_t ct, long int warp ) DEPRECATED;
+
     /**
      * Given lon/lat, update timezone information and local_offset
      * The updateLocal() method is intended to be called less