Tweaks to follow flightgear STL standard coding procedure.

diff --git a/simgear/metar/MetarReport.cpp b/simgear/metar/MetarReport.cpp
index c8a9b5a06b3b355a769e4fd5d41e2666473c4d24..159db338f3386b10575b1f2bae11891164de3534 100644 (file)
--- a/simgear/metar/MetarReport.cpp
+++ b/simgear/metar/MetarReport.cpp
@@ -1,5 +1,9 @@
 // Metar report implementation class code
 
+#include <simgear/compiler.h>
+
+#include STL_IOSTREAM
+
 #include "MetarReport.h"
 #include "Metar.h"
 

diff --git a/simgear/metar/MetarReport.h b/simgear/metar/MetarReport.h
index 0d5f4cd20a638d70a11734a6429af2796e6883a0..1d7b7857b1dbd27d5ae5baaf79ed1570b4d4c3a9 100644 (file)
--- a/simgear/metar/MetarReport.h
+++ b/simgear/metar/MetarReport.h
@@ -7,12 +7,17 @@
 #ifndef _MetarReport_
 #define _MetarReport_
 
-#include <iostream>
-#include <string>
+#include <simgear/compiler.h>
+
+#include STL_IOSTREAM
+#include STL_STRING
 #include <vector>
+
 #include <simgear/math/point3d.hxx>
 #include <simgear/math/polar3d.hxx>
 
+FG_USING_STD(string);
+
 class CMetarReport
 {
        // Typedefs, enumerations

diff --git a/simgear/metar/MetarStation.cpp b/simgear/metar/MetarStation.cpp
index a4ac37078eea9508fddaba2326f698f6e6db452a..e068b6b3d07980bfe8ee9fd7b52cf52c50cc5e2c 100644 (file)
--- a/simgear/metar/MetarStation.cpp
+++ b/simgear/metar/MetarStation.cpp
@@ -1,5 +1,8 @@
 // Metar station implementation code
 
+#include <simgear/compiler.h>
+
+#include STL_IOSTREAM
 #include <stdio.h>
 
 #include "MetarStation.h"

diff --git a/simgear/metar/MetarStation.h b/simgear/metar/MetarStation.h
index 54b74de1643dd9fa87d043b937bd1c0a4d637594..094e72593d888100eed1668dece4a637b03c49b3 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;
+
+FG_USING_STD(string);
+FG_USING_STD(vector);
+FG_USING_STD(map);
 
 class CMetarStationDB;