Christian M. says it's bad to chain one constructor call from another.

I can't find anything that addresses this in Stroustrup, but I also don't
see them doing this in any of their examples.  So I have rewritten this
instance to use default arguments to accomplish the same thing.  I imagine
there are other instances of this same sort of thing in other classes to
be fixed at a later date.

diff --git a/simgear/route/waypoint.cxx b/simgear/route/waypoint.cxx
index 0ab3b5f9cc1101011d8b6d4a8cc46f7ab5996d74..b29d046ba7b55090b367ac2d346411f729f65ae4 100644 (file)
--- a/simgear/route/waypoint.cxx
+++ b/simgear/route/waypoint.cxx
@@ -38,11 +38,6 @@ SGWayPoint::SGWayPoint( const double lon, const double lat, const double alt,
 }
 
 
-SGWayPoint::SGWayPoint() {
-    SGWayPoint( 0.0, 0.0, 0.0, WGS84, "" );
-}
-
-
 // Destructor
 SGWayPoint::~SGWayPoint() {
 }

diff --git a/simgear/route/waypoint.hxx b/simgear/route/waypoint.hxx
index aa6d8ed472ac6713f400f8df5af926fdfd763cec..f9835977c9b15d20a6c4cd0122708f31beee4473 100644 (file)
--- a/simgear/route/waypoint.hxx
+++ b/simgear/route/waypoint.hxx
@@ -79,9 +79,6 @@ private:
 
 public:
 
-    /** Default constructor */
-    SGWayPoint();
-
     /**
      * Construct a waypoint
      * @param lon destination longitude
@@ -90,8 +87,9 @@ public:
      * @param mode type of coordinates/math to use
      * @param s waypoint identifier
      */
-    SGWayPoint( const double lon, const double lat, const double alt,
-               const modetype m = WGS84, const string s = "" );
+    SGWayPoint( const double lon = 0.0, const double lat = 0.0,
+               const double alt = 0.0, const modetype m = WGS84,
+               const string s = "" );
 
     /** Destructor */
     ~SGWayPoint();