FreeBSD fix: strnstr() is already defined.

[simgear.git] / simgear / metar / MetarStation.h

diff --git a/simgear/metar/MetarStation.h b/simgear/metar/MetarStation.h
index 54b74de1643dd9fa87d043b937bd1c0a4d637594..d551c596480e8263e2c6aae556597a7d8ec535ab 100644 (file)
--- a/simgear/metar/MetarStation.h
+++ b/simgear/metar/MetarStation.h
@@ -8,13 +8,19 @@
 #ifndef _MetarStation_
 #define _MetarStation_
 
-#include <iostream>
-#include <string>
+#include <simgear/compiler.h>
+
+#include STL_IOSTREAM
+#include STL_STRING
 #include <vector>
 #include <map>
+
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
-//using namespace std;
+
+SG_USING_STD(string);
+SG_USING_STD(vector);
+SG_USING_STD(map);
 
 class CMetarStationDB;
 
@@ -67,7 +73,7 @@ public:
        char pFlag() { return m_pFlag; }
                        // Get attributes
 
-    friend std::ostream& operator << ( std::ostream&, const CMetarStation& );
+    friend ostream& operator << ( ostream&, const CMetarStation& );
        void dump();
        
 
@@ -82,7 +88,7 @@ private:
                const CMetarStation &rObj );
                        // Assignment operator.  Not implemented.
 
-       friend CMetarStationDB;
+       friend class CMetarStationDB;
 };