From 0fdbcaff635a761c8f92c9600b470c0a02ce3e4b Mon Sep 17 00:00:00 2001 From: Ralf Gerlich Date: Sun, 27 Mar 2011 10:05:14 +0200 Subject: [PATCH] Adapt to changes in simgear --- src/Airports/GenAirports/rwy_common.cxx | 2 ++ src/Airports/GenAirports/rwy_nonprec.cxx | 2 ++ src/Airports/GenAirports/rwy_prec.cxx | 2 ++ src/Airports/GenAirports/rwy_visual.cxx | 2 ++ src/BuildTiles/Clipper/clipper.cxx | 2 ++ src/BuildTiles/Clipper/testclipper.cxx | 2 ++ src/BuildTiles/Match/match.cxx | 4 +++- src/BuildTiles/Osgb36/testosgb36.cxx | 1 + src/BuildTiles/Parallel/server.cxx | 1 + src/BuildTiles/Triangulate/triangle.cxx | 2 ++ src/Lib/Array/testarray.cxx | 2 ++ src/Lib/DEM/dem.cxx | 1 + src/Lib/Geometry/util.cxx | 2 ++ src/Lib/HGT/hgt.cxx | 3 +++ src/Lib/HGT/srtmbase.cxx | 2 ++ src/Lib/Output/output.cxx | 1 + src/Prep/DemChop/demchop.cxx | 2 ++ src/Prep/DemChop/fillvoids.cxx | 2 ++ src/Prep/DemChop/hgtchop.cxx | 2 ++ src/Prep/DemChop/testassem.cxx | 2 ++ src/Prep/E00Lines/main.cxx | 2 ++ src/Prep/ShapeFile/shape-decode.cxx | 3 +++ src/Prep/TGVPF/tgvpf.cxx | 2 ++ src/Prep/UserDef/tguserdef.cxx | 1 + src/Utils/poly2ogr/poly2ogr.cxx | 2 ++ 25 files changed, 48 insertions(+), 1 deletion(-) diff --git a/src/Airports/GenAirports/rwy_common.cxx b/src/Airports/GenAirports/rwy_common.cxx index c9339a26..557b296b 100644 --- a/src/Airports/GenAirports/rwy_common.cxx +++ b/src/Airports/GenAirports/rwy_common.cxx @@ -29,6 +29,8 @@ #include "poly_extra.hxx" #include "rwy_common.hxx" +#include + using std::string; diff --git a/src/Airports/GenAirports/rwy_nonprec.cxx b/src/Airports/GenAirports/rwy_nonprec.cxx index ddf62680..085c19a0 100644 --- a/src/Airports/GenAirports/rwy_nonprec.cxx +++ b/src/Airports/GenAirports/rwy_nonprec.cxx @@ -28,6 +28,8 @@ #include "rwy_common.hxx" #include "rwy_nonprec.hxx" +#include + using std::string; diff --git a/src/Airports/GenAirports/rwy_prec.cxx b/src/Airports/GenAirports/rwy_prec.cxx index c98c6b0a..d11f94ba 100644 --- a/src/Airports/GenAirports/rwy_prec.cxx +++ b/src/Airports/GenAirports/rwy_prec.cxx @@ -28,6 +28,8 @@ #include "rwy_common.hxx" #include "rwy_nonprec.hxx" +#include + using std::string; diff --git a/src/Airports/GenAirports/rwy_visual.cxx b/src/Airports/GenAirports/rwy_visual.cxx index 06fff338..fe524586 100644 --- a/src/Airports/GenAirports/rwy_visual.cxx +++ b/src/Airports/GenAirports/rwy_visual.cxx @@ -29,6 +29,8 @@ #include "rwy_common.hxx" #include "rwy_visual.hxx" +#include + using std::string; diff --git a/src/BuildTiles/Clipper/clipper.cxx b/src/BuildTiles/Clipper/clipper.cxx index 4fdcd456..91cefa63 100644 --- a/src/BuildTiles/Clipper/clipper.cxx +++ b/src/BuildTiles/Clipper/clipper.cxx @@ -39,6 +39,8 @@ #include +#include + using std::cout; using std::endl; using std::string; diff --git a/src/BuildTiles/Clipper/testclipper.cxx b/src/BuildTiles/Clipper/testclipper.cxx index d0bdf1a6..0af0256b 100644 --- a/src/BuildTiles/Clipper/testclipper.cxx +++ b/src/BuildTiles/Clipper/testclipper.cxx @@ -27,6 +27,8 @@ #include "clipper.hxx" +#include + using std::cout; using std::endl; using std::string; diff --git a/src/BuildTiles/Match/match.cxx b/src/BuildTiles/Match/match.cxx index cf35c929..4198db2e 100644 --- a/src/BuildTiles/Match/match.cxx +++ b/src/BuildTiles/Match/match.cxx @@ -33,9 +33,11 @@ #include "match.hxx" +#include + using std::cout; using std::endl; - +using std::string; TGMatch::TGMatch( void ) { } diff --git a/src/BuildTiles/Osgb36/testosgb36.cxx b/src/BuildTiles/Osgb36/testosgb36.cxx index 7e889029..baca6d5c 100644 --- a/src/BuildTiles/Osgb36/testosgb36.cxx +++ b/src/BuildTiles/Osgb36/testosgb36.cxx @@ -2,6 +2,7 @@ #include #include +#include #include "osgb36.hxx" diff --git a/src/BuildTiles/Parallel/server.cxx b/src/BuildTiles/Parallel/server.cxx index f3897e28..48084efb 100644 --- a/src/BuildTiles/Parallel/server.cxx +++ b/src/BuildTiles/Parallel/server.cxx @@ -12,6 +12,7 @@ #include #include +#include #ifdef _MSC_VER # include typedef int socklen_t; diff --git a/src/BuildTiles/Triangulate/triangle.cxx b/src/BuildTiles/Triangulate/triangle.cxx index b341eac4..bb24df3d 100644 --- a/src/BuildTiles/Triangulate/triangle.cxx +++ b/src/BuildTiles/Triangulate/triangle.cxx @@ -28,6 +28,8 @@ #include "triangle.hxx" +#include + using std::cout; using std::endl; using std::string; diff --git a/src/Lib/Array/testarray.cxx b/src/Lib/Array/testarray.cxx index 776dbaf1..8bc03d87 100644 --- a/src/Lib/Array/testarray.cxx +++ b/src/Lib/Array/testarray.cxx @@ -9,6 +9,8 @@ #include #include #include +#include +#include #include "array.hxx" using std::cout; diff --git a/src/Lib/DEM/dem.cxx b/src/Lib/DEM/dem.cxx index e98e9e15..2dcbb64a 100644 --- a/src/Lib/DEM/dem.cxx +++ b/src/Lib/DEM/dem.cxx @@ -58,6 +58,7 @@ using std::cout; using std::endl; +using std::string; TGDem::TGDem() : diff --git a/src/Lib/Geometry/util.cxx b/src/Lib/Geometry/util.cxx index eb67be22..ad13c47d 100644 --- a/src/Lib/Geometry/util.cxx +++ b/src/Lib/Geometry/util.cxx @@ -12,6 +12,8 @@ #include +#include + using std::vector; namespace tg { diff --git a/src/Lib/HGT/hgt.cxx b/src/Lib/HGT/hgt.cxx index 61c39757..96216333 100644 --- a/src/Lib/HGT/hgt.cxx +++ b/src/Lib/HGT/hgt.cxx @@ -43,10 +43,13 @@ #include #include +#include + #include "hgt.hxx" using std::cout; using std::endl; +using std::string; TGHgt::TGHgt( int _res ) { diff --git a/src/Lib/HGT/srtmbase.cxx b/src/Lib/HGT/srtmbase.cxx index 97db382a..a57de5c2 100644 --- a/src/Lib/HGT/srtmbase.cxx +++ b/src/Lib/HGT/srtmbase.cxx @@ -28,12 +28,14 @@ #include #include +#include #include #include "srtmbase.hxx" using std::cout; using std::endl; +using std::string; // write out the area of data covered by the specified bucket. Data diff --git a/src/Lib/Output/output.cxx b/src/Lib/Output/output.cxx index 9af459c6..86f3720a 100644 --- a/src/Lib/Output/output.cxx +++ b/src/Lib/Output/output.cxx @@ -44,6 +44,7 @@ using std:: cout ; using std:: endl ; +using std::string; void write_polygon( const TGPolygon& poly, const string& base ) { diff --git a/src/Prep/DemChop/demchop.cxx b/src/Prep/DemChop/demchop.cxx index 79846c8a..e9a5b649 100644 --- a/src/Prep/DemChop/demchop.cxx +++ b/src/Prep/DemChop/demchop.cxx @@ -30,6 +30,8 @@ #include #include +#include + #include #include #include diff --git a/src/Prep/DemChop/fillvoids.cxx b/src/Prep/DemChop/fillvoids.cxx index d777427d..517b21cb 100644 --- a/src/Prep/DemChop/fillvoids.cxx +++ b/src/Prep/DemChop/fillvoids.cxx @@ -35,6 +35,8 @@ #include +#include + using std::cout; using std::endl; using std::string; diff --git a/src/Prep/DemChop/hgtchop.cxx b/src/Prep/DemChop/hgtchop.cxx index 5bb9798b..d439176d 100644 --- a/src/Prep/DemChop/hgtchop.cxx +++ b/src/Prep/DemChop/hgtchop.cxx @@ -37,6 +37,8 @@ #include #include +#include + using std::cout; using std::endl; using std::string; diff --git a/src/Prep/DemChop/testassem.cxx b/src/Prep/DemChop/testassem.cxx index a6554fb0..42ff80fb 100644 --- a/src/Prep/DemChop/testassem.cxx +++ b/src/Prep/DemChop/testassem.cxx @@ -40,6 +40,8 @@ # include #endif +#include + using std::cout; using std::endl; using std::string; diff --git a/src/Prep/E00Lines/main.cxx b/src/Prep/E00Lines/main.cxx index a5b8aa00..502ac2bb 100644 --- a/src/Prep/E00Lines/main.cxx +++ b/src/Prep/E00Lines/main.cxx @@ -45,6 +45,8 @@ #include #include +#include + using std::cerr; using std::cout; using std::endl; diff --git a/src/Prep/ShapeFile/shape-decode.cxx b/src/Prep/ShapeFile/shape-decode.cxx index 836ca335..ddf63ee1 100644 --- a/src/Prep/ShapeFile/shape-decode.cxx +++ b/src/Prep/ShapeFile/shape-decode.cxx @@ -45,6 +45,9 @@ #include #include +#include +#include + using std:: cout ; using std:: endl ; using std:: string ; diff --git a/src/Prep/TGVPF/tgvpf.cxx b/src/Prep/TGVPF/tgvpf.cxx index 7d418f6c..e3e67d71 100644 --- a/src/Prep/TGVPF/tgvpf.cxx +++ b/src/Prep/TGVPF/tgvpf.cxx @@ -46,6 +46,8 @@ #include #include +#include + using std::cerr; using std::cout; using std::endl; diff --git a/src/Prep/UserDef/tguserdef.cxx b/src/Prep/UserDef/tguserdef.cxx index b0b1af05..28a690c8 100644 --- a/src/Prep/UserDef/tguserdef.cxx +++ b/src/Prep/UserDef/tguserdef.cxx @@ -16,6 +16,7 @@ #include #include +#include #include using std::vector; diff --git a/src/Utils/poly2ogr/poly2ogr.cxx b/src/Utils/poly2ogr/poly2ogr.cxx index 02fa45fe..8fe3c6fa 100644 --- a/src/Utils/poly2ogr/poly2ogr.cxx +++ b/src/Utils/poly2ogr/poly2ogr.cxx @@ -40,6 +40,8 @@ #include #include +#include + #include #include