From e813c093fc444d9c36bb992768e37a1abb8c47d4 Mon Sep 17 00:00:00 2001 From: Ralf Gerlich Date: Tue, 17 Jun 2008 11:06:35 +0200 Subject: [PATCH] Adapt to current SimGear version ( include changes by fredb) --- src/Airports/GenAirports/main.cxx | 4 ++++ src/BuildTiles/Clipper/clipper.cxx | 3 +++ src/BuildTiles/Main/main.cxx | 1 + src/BuildTiles/Main/master.cxx | 6 +++++- src/BuildTiles/Parallel/server.cxx | 1 + src/Lib/Array/array.cxx | 1 + src/Lib/Array/testarray.cxx | 2 ++ src/Lib/DEM/dem.cxx | 2 ++ src/Lib/DEM/dem.hxx | 10 ++++++---- src/Lib/Geometry/trisegs.cxx | 4 +++- src/Lib/HGT/hgt.cxx | 1 + src/Lib/Polygon/chop-bin.cxx | 4 ++++ src/Lib/e00/e00.cxx | 1 + src/Lib/e00/teste00.cxx | 2 ++ src/Lib/vpf/table.cxx | 14 +++++++++----- src/Lib/vpf/vpf-topology.cxx | 18 +++++++++++------- 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/DemInfo/deminfo.cxx | 6 +++++- src/Prep/E00Lines/main.cxx | 1 + src/Prep/GSHHS/debug.cxx | 2 ++ src/Prep/GSHHS/gshhs_split.cxx | 2 ++ src/Prep/GSHHS/main.cxx | 2 ++ src/Prep/Photo/photo.cxx | 2 ++ src/Prep/Photo/wgs84offset.cxx | 4 ++++ src/Prep/ShapeFile/shape-decode.cxx | 2 ++ src/Prep/TGVPF/tgvpf.cxx | 1 + src/Prep/Terra/Array.h | 2 ++ src/Prep/UserDef/tguserdef.cxx | 4 ++++ 31 files changed, 91 insertions(+), 19 deletions(-) diff --git a/src/Airports/GenAirports/main.cxx b/src/Airports/GenAirports/main.cxx index 5876747e..f6f715b7 100644 --- a/src/Airports/GenAirports/main.cxx +++ b/src/Airports/GenAirports/main.cxx @@ -40,6 +40,10 @@ SG_USING_STD(vector); #include #include #include STL_STRING +#include STL_IOSTREAM + +SG_USING_STD(cout); +SG_USING_STD(endl); #include #include diff --git a/src/BuildTiles/Clipper/clipper.cxx b/src/BuildTiles/Clipper/clipper.cxx index c252d1bb..7557693c 100644 --- a/src/BuildTiles/Clipper/clipper.cxx +++ b/src/BuildTiles/Clipper/clipper.cxx @@ -37,7 +37,10 @@ #include "clipper.hxx" +#include STL_IOSTREAM + SG_USING_STD(cout); +SG_USING_STD(endl); #define MASK_CLIP 1 diff --git a/src/BuildTiles/Main/main.cxx b/src/BuildTiles/Main/main.cxx index b897e93e..412727ba 100644 --- a/src/BuildTiles/Main/main.cxx +++ b/src/BuildTiles/Main/main.cxx @@ -64,6 +64,7 @@ #include "construct.hxx" SG_USING_STD(cout); +SG_USING_STD(cerr); SG_USING_STD(endl); SG_USING_STD(string); SG_USING_STD(vector); diff --git a/src/BuildTiles/Main/master.cxx b/src/BuildTiles/Main/master.cxx index e260e69c..b1ccf961 100644 --- a/src/BuildTiles/Main/master.cxx +++ b/src/BuildTiles/Main/master.cxx @@ -24,11 +24,14 @@ # include #endif +#include + #include // for system() #include // for stat() #include // for stat() -#include +#include STL_STRING +#include STL_IOSTREAM #include @@ -41,6 +44,7 @@ // #include // #include +SG_USING_STD(string); SG_USING_STD(cout); SG_USING_STD(endl); diff --git a/src/BuildTiles/Parallel/server.cxx b/src/BuildTiles/Parallel/server.cxx index 8739c53b..18549689 100644 --- a/src/BuildTiles/Parallel/server.cxx +++ b/src/BuildTiles/Parallel/server.cxx @@ -28,6 +28,7 @@ SG_USING_STD( cout ); SG_USING_STD( cerr ); SG_USING_STD( endl ); +SG_USING_STD( string ); #if defined (__sun) || defined (__CYGWIN__) || defined(sgi) # define WAIT_ANY (pid_t)-1 diff --git a/src/Lib/Array/array.cxx b/src/Lib/Array/array.cxx index c0f09742..4d25752d 100644 --- a/src/Lib/Array/array.cxx +++ b/src/Lib/Array/array.cxx @@ -27,6 +27,7 @@ #include +#include STL_IOSTREAM #include STL_STRING #include diff --git a/src/Lib/Array/testarray.cxx b/src/Lib/Array/testarray.cxx index 1535f4fe..3586507b 100644 --- a/src/Lib/Array/testarray.cxx +++ b/src/Lib/Array/testarray.cxx @@ -1,5 +1,7 @@ +#include #include +#include STL_IOSTREAM #include "array.hxx" SG_USING_STD(cout); diff --git a/src/Lib/DEM/dem.cxx b/src/Lib/DEM/dem.cxx index a66e8497..ffc7f001 100644 --- a/src/Lib/DEM/dem.cxx +++ b/src/Lib/DEM/dem.cxx @@ -33,6 +33,8 @@ #include #include +#include STL_IOSTREAM + #ifdef HAVE_SYS_STAT_H # include // stat() #endif diff --git a/src/Lib/DEM/dem.hxx b/src/Lib/DEM/dem.hxx index 34e6d276..162672d2 100644 --- a/src/Lib/DEM/dem.hxx +++ b/src/Lib/DEM/dem.hxx @@ -34,9 +34,11 @@ # include #endif +#include #include #include +#include STL_STRING #define DEM_SIZE 1200 #define DEM_SIZE_1 1201 @@ -82,7 +84,7 @@ private: int z_units; // 1 = feet, 2 = meters // return next token from input stream - string next_token(); + std::string next_token(); // return next integer from input stream int next_int(); @@ -97,13 +99,13 @@ public: // Constructor TGDem(); - TGDem( const string& file ); + TGDem( const std::string& file ); // Destructor ~TGDem(); // open a DEM file (use "-" if input is coming from stdin) - bool open ( const string& file ); + bool open ( const std::string& file ); // close a DEM file bool close(); @@ -120,7 +122,7 @@ public: // write out the area of data covered by the specified bucket. // Data is written out column by column starting at the lower left // hand corner. - bool write_area( const string& root, SGBucket& b, bool compress ); + bool write_area( const std::string& root, SGBucket& b, bool compress ); // Informational methods inline double get_originx() const { return originx; } diff --git a/src/Lib/Geometry/trisegs.cxx b/src/Lib/Geometry/trisegs.cxx index 70576e8b..d66d403c 100644 --- a/src/Lib/Geometry/trisegs.cxx +++ b/src/Lib/Geometry/trisegs.cxx @@ -20,10 +20,12 @@ // // $Id: trisegs.cxx,v 1.10 2004-11-19 22:25:50 curt Exp $ - +#include #include #include +#include STL_IOSTREAM + #include "trinodes.hxx" #include "trisegs.hxx" diff --git a/src/Lib/HGT/hgt.cxx b/src/Lib/HGT/hgt.cxx index 1250b689..162d2872 100644 --- a/src/Lib/HGT/hgt.cxx +++ b/src/Lib/HGT/hgt.cxx @@ -28,6 +28,7 @@ #include #include // atof() +#include STL_IOSTREAM #ifdef SG_HAVE_STD_INCLUDES # include diff --git a/src/Lib/Polygon/chop-bin.cxx b/src/Lib/Polygon/chop-bin.cxx index c7309def..fc1ceec9 100644 --- a/src/Lib/Polygon/chop-bin.cxx +++ b/src/Lib/Polygon/chop-bin.cxx @@ -30,6 +30,10 @@ #include #include STL_STRING +#include STL_IOSTREAM + +SG_USING_STD(cout); +SG_USING_STD(endl); #include #include diff --git a/src/Lib/e00/e00.cxx b/src/Lib/e00/e00.cxx index 940d8c8d..00f913d2 100644 --- a/src/Lib/e00/e00.cxx +++ b/src/Lib/e00/e00.cxx @@ -11,6 +11,7 @@ #include #include +#include SG_USING_STD(vector); SG_USING_STD(map); diff --git a/src/Lib/e00/teste00.cxx b/src/Lib/e00/teste00.cxx index 5f27b23e..be4dd4ca 100644 --- a/src/Lib/e00/teste00.cxx +++ b/src/Lib/e00/teste00.cxx @@ -4,6 +4,8 @@ # include #endif +#include + #include #include "e00.hxx" diff --git a/src/Lib/vpf/table.cxx b/src/Lib/vpf/table.cxx index c70a78d2..24e0db0a 100644 --- a/src/Lib/vpf/table.cxx +++ b/src/Lib/vpf/table.cxx @@ -1,14 +1,18 @@ // table.cxx - implementation of VpfTable // This file is released into the Public Domain, and comes with NO WARRANTY! -#include -#include +#include + +#include STL_STRING +#include STL_FSTREAM #include // ios_binary -using std::string; -using std::ifstream; -using std::istream; +#include + +SG_USING_STD(string); +SG_USING_STD(ifstream); +SG_USING_STD(istream); #include "vpfbase.hxx" #include "table.hxx" diff --git a/src/Lib/vpf/vpf-topology.cxx b/src/Lib/vpf/vpf-topology.cxx index 81df7d3d..35f22b4e 100644 --- a/src/Lib/vpf/vpf-topology.cxx +++ b/src/Lib/vpf/vpf-topology.cxx @@ -1,14 +1,18 @@ // vpf-topology.cxx - program to dump a topology to output. // This file is released into the Public Domain, and comes with NO WARRANTY! -#include -using std::cout; -using std::cerr; -using std::endl; -using std::ostream; +#include -#include -using std::string; +#include STL_IOSTREAM +#include STL_STRING + +#include + +SG_USING_STD(cout); +SG_USING_STD(cerr); +SG_USING_STD(endl); +SG_USING_STD(ostream); +SG_USING_STD(string); #include "vpf.hxx" diff --git a/src/Prep/DemChop/demchop.cxx b/src/Prep/DemChop/demchop.cxx index 266c7561..aaaeb0ed 100644 --- a/src/Prep/DemChop/demchop.cxx +++ b/src/Prep/DemChop/demchop.cxx @@ -27,6 +27,7 @@ #include +#include STL_IOSTREAM #include STL_STRING #include @@ -40,6 +41,7 @@ #include "point2d.hxx" +SG_USING_STD(endl); SG_USING_STD(cout); SG_USING_STD(string); diff --git a/src/Prep/DemChop/fillvoids.cxx b/src/Prep/DemChop/fillvoids.cxx index e158d0e9..fec96509 100644 --- a/src/Prep/DemChop/fillvoids.cxx +++ b/src/Prep/DemChop/fillvoids.cxx @@ -27,6 +27,7 @@ #include #include STL_STRING +#include STL_IOSTREAM #include #include @@ -35,6 +36,7 @@ #include SG_USING_STD(cout); +SG_USING_STD(endl); SG_USING_STD(string); diff --git a/src/Prep/DemChop/hgtchop.cxx b/src/Prep/DemChop/hgtchop.cxx index 98e8cf51..665c6373 100644 --- a/src/Prep/DemChop/hgtchop.cxx +++ b/src/Prep/DemChop/hgtchop.cxx @@ -28,6 +28,7 @@ #include #include STL_STRING +#include STL_IOSTREAM #include #include @@ -40,6 +41,7 @@ #endif SG_USING_STD(cout); +SG_USING_STD(endl); SG_USING_STD(string); diff --git a/src/Prep/DemChop/testassem.cxx b/src/Prep/DemChop/testassem.cxx index f1e88e84..47cfd35f 100644 --- a/src/Prep/DemChop/testassem.cxx +++ b/src/Prep/DemChop/testassem.cxx @@ -28,6 +28,7 @@ #include #include STL_STRING +#include STL_IOSTREAM #include #include @@ -40,6 +41,7 @@ #endif SG_USING_STD(cout); +SG_USING_STD(endl); SG_USING_STD(string); diff --git a/src/Prep/DemInfo/deminfo.cxx b/src/Prep/DemInfo/deminfo.cxx index 19d0465b..db6fa5e1 100644 --- a/src/Prep/DemInfo/deminfo.cxx +++ b/src/Prep/DemInfo/deminfo.cxx @@ -21,15 +21,19 @@ // $Id: deminfo.cxx,v 1.7 2004-11-19 22:25:51 curt Exp $ // +#include + +#include STL_IOSTREAM +#include STL_STRING #include #include #include -#include #include SG_USING_STD(cout); +SG_USING_STD(string); // static float dem_data[DEM_SIZE_1][DEM_SIZE_1]; diff --git a/src/Prep/E00Lines/main.cxx b/src/Prep/E00Lines/main.cxx index 0dfb59db..293bcee3 100644 --- a/src/Prep/E00Lines/main.cxx +++ b/src/Prep/E00Lines/main.cxx @@ -39,6 +39,7 @@ SG_USING_STD(cerr); SG_USING_STD(cout); +SG_USING_STD(endl); SG_USING_STD(string); SG_USING_STD(vector); diff --git a/src/Prep/GSHHS/debug.cxx b/src/Prep/GSHHS/debug.cxx index ca047e33..8d449c70 100644 --- a/src/Prep/GSHHS/debug.cxx +++ b/src/Prep/GSHHS/debug.cxx @@ -30,6 +30,7 @@ #include #include STL_STRING +#include STL_IOSTREAM #include @@ -48,6 +49,7 @@ SG_USING_STD(cout); SG_USING_STD(cin); +SG_USING_STD(endl); // write result to unique file name void write_result( const TGPolygon& result ) { diff --git a/src/Prep/GSHHS/gshhs_split.cxx b/src/Prep/GSHHS/gshhs_split.cxx index 4f588b6b..f486f9be 100644 --- a/src/Prep/GSHHS/gshhs_split.cxx +++ b/src/Prep/GSHHS/gshhs_split.cxx @@ -27,6 +27,7 @@ #include #include STL_STRING +#include STL_IOSTREAM #include #include @@ -39,6 +40,7 @@ #include "gshhs_split.hxx" SG_USING_STD(cout); +SG_USING_STD(endl); SG_USING_STD(string); diff --git a/src/Prep/GSHHS/main.cxx b/src/Prep/GSHHS/main.cxx index 6b7397d6..8af3c465 100644 --- a/src/Prep/GSHHS/main.cxx +++ b/src/Prep/GSHHS/main.cxx @@ -29,6 +29,7 @@ #include +#include STL_IOSTREAM #include STL_STRING #include @@ -47,6 +48,7 @@ SG_USING_STD( string ); SG_USING_STD( cout ); +SG_USING_STD( endl ); // hackity, hackity, hack ... cough cough #ifdef i386 diff --git a/src/Prep/Photo/photo.cxx b/src/Prep/Photo/photo.cxx index 96391792..f149c82f 100644 --- a/src/Prep/Photo/photo.cxx +++ b/src/Prep/Photo/photo.cxx @@ -30,6 +30,7 @@ #include #include STL_STRING +#include STL_IOSTREAM #include #include @@ -45,6 +46,7 @@ SG_USING_STD(string); SG_USING_STD(cout); +SG_USING_STD(endl); const int MAX_XDIV = 16; diff --git a/src/Prep/Photo/wgs84offset.cxx b/src/Prep/Photo/wgs84offset.cxx index aba2d8cd..3e5b49c8 100644 --- a/src/Prep/Photo/wgs84offset.cxx +++ b/src/Prep/Photo/wgs84offset.cxx @@ -1,5 +1,9 @@ // calc wgs84 offset given starting lon/lat/alt, radial and distance +#include + +#include STL_IOSTREAM + #include #include diff --git a/src/Prep/ShapeFile/shape-decode.cxx b/src/Prep/ShapeFile/shape-decode.cxx index 6f9beb15..6125eca5 100644 --- a/src/Prep/ShapeFile/shape-decode.cxx +++ b/src/Prep/ShapeFile/shape-decode.cxx @@ -30,6 +30,7 @@ #include #include STL_STRING +#include STL_IOSTREAM #include #include @@ -49,6 +50,7 @@ #endif SG_USING_STD( cout ); +SG_USING_STD( endl ); SG_USING_STD( string ); SG_USING_STD( map ); diff --git a/src/Prep/TGVPF/tgvpf.cxx b/src/Prep/TGVPF/tgvpf.cxx index 5e3cfd3f..4d24ef15 100644 --- a/src/Prep/TGVPF/tgvpf.cxx +++ b/src/Prep/TGVPF/tgvpf.cxx @@ -40,6 +40,7 @@ SG_USING_STD(cerr); SG_USING_STD(cout); +SG_USING_STD(endl); SG_USING_STD(string); SG_USING_STD(vector); diff --git a/src/Prep/Terra/Array.h b/src/Prep/Terra/Array.h index 112a3660..c910ffeb 100644 --- a/src/Prep/Terra/Array.h +++ b/src/Prep/Terra/Array.h @@ -1,6 +1,8 @@ #ifndef ARRAY_INCLUDED // -*- C++ -*- #define ARRAY_INCLUDED +#include + // // Array classes // diff --git a/src/Prep/UserDef/tguserdef.cxx b/src/Prep/UserDef/tguserdef.cxx index e3367fcd..62899db3 100644 --- a/src/Prep/UserDef/tguserdef.cxx +++ b/src/Prep/UserDef/tguserdef.cxx @@ -13,10 +13,14 @@ #include #include +#include STL_IOSTREAM + #include #include SG_USING_STD(vector); +SG_USING_STD(cerr); +SG_USING_STD(endl); static string prog_name; static string work_dir = ".";