Don't waste space with too huge stl containers.

[simgear.git] / simgear / route / waypoint.hxx

diff --git a/simgear/route/waypoint.hxx b/simgear/route/waypoint.hxx
index a95b030f3576bdf8cefdfeb0c4e5898360590dca..206dcb3b8f0bb2d9688bcd355ae52e0aec3fd2c1 100644 (file)
--- a/simgear/route/waypoint.hxx
+++ b/simgear/route/waypoint.hxx
@@ -19,7 +19,7 @@
 //
 // You should have received a copy of the GNU General Public License
 // along with this program; if not, write to the Free Software
-// Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 //
 // $Id$
 
@@ -28,16 +28,16 @@
 #define _WAYPOINT_HXX
 
 
-#ifndef __cplusplus                                                          
+#ifndef __cplusplus
 # error This library requires C++
-#endif                                   
+#endif
 
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
-SG_USING_STD(string);
+using std::string;
 
 
 /**
@@ -91,7 +91,7 @@ public:
      */
     SGWayPoint( const double lon = 0.0, const double lat = 0.0,
                const double alt = 0.0, const modetype m = WGS84,
-               const string s = "", const string n = "" );
+               const string& s = "", const string& n = "" );
 
     /** Destructor */
     ~SGWayPoint();
@@ -153,10 +153,10 @@ public:
     inline void set_distance( double d ) { distance = d; }
 
     /** @return waypoint id */
-    inline string get_id() const { return id; }
+    inline const string& get_id() const { return id; }
 
     /** @return waypoint name */
-    inline string get_name() const { return name; }
+    inline const string& get_name() const { return name; }
 
 };