Fix bad interaction between CourseAndDistance overloads and use of implicit

SGWaypoint construction from SGGeod.

diff --git a/simgear/route/waypoint.cxx b/simgear/route/waypoint.cxx
index 697eb37458e4f59bfb53ce8dfbd50a3c3de514d0..189bc59bb38a0f3b117d8e7744e3939ab755083a 100644 (file)
--- a/simgear/route/waypoint.cxx
+++ b/simgear/route/waypoint.cxx
@@ -81,5 +81,5 @@ void SGWayPoint::CourseAndDistance( const double cur_lon,
 // Calculate course and distances between two waypoints
 void SGWayPoint::CourseAndDistance( const SGWayPoint &wp,
                        double *course, double *dist ) const {
-    CourseAndDistance( wp.get_target(), course, dist );
+    CourseAndDistance( wp.get_target(), *course, *dist );
 }

diff --git a/simgear/route/waypoint.hxx b/simgear/route/waypoint.hxx
index 2141200c40daa7c86b42161eae1acc75693f6323..dbd831d3648e41be117159603615a1b4d285b6a3 100644 (file)
--- a/simgear/route/waypoint.hxx
+++ b/simgear/route/waypoint.hxx
@@ -92,7 +92,7 @@ public:
     /**
      * Construct from a geodetic position, in WGS84 coordinates
      */
-    SGWayPoint(const SGGeod& pos, const std::string& s = "", const std::string& n = "" );
+    SGWayPoint(const SGGeod& pos, const std::string& s, const std::string& n);
 
     /** Destructor */
     ~SGWayPoint();