This should apply, and everything should build cleanly, in isolation from the

[flightgear.git] / src / Airports / runways.hxx

diff --git a/src/Airports/runways.hxx b/src/Airports/runways.hxx
index 5fd647811eb88d55e88805efd387963b83b28d4e..6dcf4e76d9370a9d04178551fdaf49102d54103d 100644 (file)
--- a/src/Airports/runways.hxx
+++ b/src/Airports/runways.hxx
@@ -16,7 +16,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$
 
@@ -36,7 +36,7 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 #include <map>
 
 SG_USING_STD(string);
@@ -44,7 +44,7 @@ SG_USING_STD(multimap);
 
 
 struct ltstr {
-    bool operator()(const string s1, const string s2) const {
+    bool operator()(const string& s1, const string& s2) const {
         return s1 < s2;
     }
 };
@@ -94,13 +94,13 @@ public:
     ~FGRunwayList();
 
     // add an entry to the list
-    void add( const string id, const string rwy_no,
+    void add( const string& id, const string& rwy_no,
               const double longitude, const double latitude,
               const double heading, const double length, const double width,
               const double displ_thresh1, const double displ_thresh2,
               const double stopway1, const double stopway2,
-              const string lighting_flags, const int surface_code,
-              const string shoulder_code, const int marking_code,
+              const string& lighting_flags, const int surface_code,
+              const string& shoulder_code, const int marking_code,
               const double smoothness, const bool dist_remaining );
 
     // search for the specified apt id.