Merge branch 'next' of gitorious.org:fg/flightgear into next

[flightgear.git] / src / Environment / fgmetar.hxx

diff --git a/src/Environment/fgmetar.hxx b/src/Environment/fgmetar.hxx
index 7d69684f5ff55b920cbd30fdfb2c8b9864e5550b..f54288b5f9afdfca8c19217996b069accf1deadd 100644 (file)
--- a/src/Environment/fgmetar.hxx
+++ b/src/Environment/fgmetar.hxx
@@ -30,15 +30,14 @@
 
 #include <simgear/environment/metar.hxx>
 
-SG_USING_STD(vector);
-SG_USING_STD(map);
-SG_USING_STD(string);
+using std::vector;
+using std::map;
+using std::string;
 
 
-class FGMetar : public SGMetar {
+class FGMetar : public SGMetar, public SGReferenced {
 public:
-       FGMetar(const string& icao, const string& proxy = "", const string& port = "",
-                       const string &auth = "");
+       FGMetar(const string& icao);
 
        long    getAge_min()                    const;
        time_t  getTime()                       const { return _time; }