Remove deprecated, now unused functions.

diff --git a/simgear/math/SGGeoc.hxx b/simgear/math/SGGeoc.hxx
index 14929dbfdc580876a6410efe91116fe2ac7ae581..3a27e47a66d6cd0b8b367038ef50204b94480c97 100644 (file)
--- a/simgear/math/SGGeoc.hxx
+++ b/simgear/math/SGGeoc.hxx
@@ -27,14 +27,6 @@ class SGGeoc {
 public:
   /// Default constructor, initializes the instance to lat = lon = lat = 0
   SGGeoc(void);
-  /// Initialize from a cartesian vector assumed to be in meters
-  /// Note that this conversion is relatively expensive to compute
-  /// depricated
-  SGGeoc(const SGVec3<double>& cart);
-  /// Initialize from a geodetic position
-  /// Note that this conversion is relatively expensive to compute
-  /// depricated
-  SGGeoc(const SGGeod& geod);
 
   /// Factory from angular values in radians and radius in ft
   static SGGeoc fromRadFt(double lon, double lat, double radius);
@@ -112,20 +104,6 @@ SGGeoc::SGGeoc(double lon, double lat, double radius) :
 {
 }
 
-inline
-SGGeoc::SGGeoc(const SGVec3<double>& cart)
-{
-  SGGeodesy::SGCartToGeoc(cart, *this);
-}
-
-inline
-SGGeoc::SGGeoc(const SGGeod& geod)
-{
-  SGVec3<double> cart;
-  SGGeodesy::SGGeodToCart(geod, cart);
-  SGGeodesy::SGCartToGeoc(cart, *this);
-}
-
 inline
 SGGeoc
 SGGeoc::fromRadFt(double lon, double lat, double radius)

diff --git a/simgear/math/SGGeod.hxx b/simgear/math/SGGeod.hxx
index 7124fdd1e870f844b157a84a121b7c5621cf2ea3..50c6b97dac2fd4c82fbb9901de8c3e071aa073ee 100644 (file)
--- a/simgear/math/SGGeod.hxx
+++ b/simgear/math/SGGeod.hxx
@@ -27,14 +27,6 @@ class SGGeod {
 public:
   /// Default constructor, initializes the instance to lat = lon = elev = 0
   SGGeod(void);
-  /// Initialize from a cartesian vector assumed to be in meters
-  /// Note that this conversion is relatively expensive to compute
-  /// depricated
-  SGGeod(const SGVec3<double>& cart);
-  /// Initialize from a geocentric position
-  /// Note that this conversion is relatively expensive to compute
-  /// depricated
-  SGGeod(const SGGeoc& geoc);
 
   /// Factory from angular values in radians and elevation is 0
   static SGGeod fromRad(double lon, double lat);
@@ -116,20 +108,6 @@ SGGeod::SGGeod(double lon, double lat, double elevation) :
 {
 }
 
-inline
-SGGeod::SGGeod(const SGVec3<double>& cart)
-{
-  SGGeodesy::SGCartToGeod(cart, *this);
-}
-
-inline
-SGGeod::SGGeod(const SGGeoc& geoc)
-{
-  SGVec3<double> cart;
-  SGGeodesy::SGGeocToCart(geoc, cart);
-  SGGeodesy::SGCartToGeod(cart, *this);
-}
-
 inline
 SGGeod
 SGGeod::fromRad(double lon, double lat)

diff --git a/simgear/math/SGVec3.hxx b/simgear/math/SGVec3.hxx
index 1d2a16277a92434f9f39b833934d75366c6532af..b08e18f78aff2f99ea4df5684852b472f8db197d 100644 (file)
--- a/simgear/math/SGVec3.hxx
+++ b/simgear/math/SGVec3.hxx
@@ -43,16 +43,6 @@ public:
   /// make sure it has at least 3 elements
   explicit SGVec3(const T* data)
   { _data[0] = data[0]; _data[1] = data[1]; _data[2] = data[2]; }
-  /// Constructor. Initialize by a geodetic coordinate
-  /// Note that this conversion is relatively expensive to compute
-  /// depricated
-  SGVec3(const SGGeod& geod)
-  { SGGeodesy::SGGeodToCart(geod, *this); }
-  /// Constructor. Initialize by a geocentric coordinate
-  /// Note that this conversion is relatively expensive to compute
-  /// depricated
-  SGVec3(const SGGeoc& geoc)
-  { SGGeodesy::SGGeocToCart(geoc, *this); }
 
   /// Access by index, the index is unchecked
   const T& operator()(unsigned i) const