diff --git a/src/Airports/GenAirports/build.cxx b/src/Airports/GenAirports/build.cxx index 2bbef0fb..aed0c834 100644 --- a/src/Airports/GenAirports/build.cxx +++ b/src/Airports/GenAirports/build.cxx @@ -38,7 +38,7 @@ #include #include -#include STL_STRING +#include #include // plib include @@ -74,9 +74,9 @@ #include "build.hxx" -SG_USING_STD(map); -SG_USING_STD(less); -SG_USING_STD(string); +using std::map; +using std::less; +using std::string; // calculate texture coordinates for runway section using the provided diff --git a/src/Airports/GenAirports/convex_hull.cxx b/src/Airports/GenAirports/convex_hull.cxx index f8fc1d6f..deb607fc 100644 --- a/src/Airports/GenAirports/convex_hull.cxx +++ b/src/Airports/GenAirports/convex_hull.cxx @@ -34,8 +34,8 @@ #include #include -SG_USING_STD(less); -SG_USING_STD(map); +using std::less; +using std::map; #include diff --git a/src/Airports/GenAirports/lights.cxx b/src/Airports/GenAirports/lights.cxx index ef5d3d6d..f5171818 100644 --- a/src/Airports/GenAirports/lights.cxx +++ b/src/Airports/GenAirports/lights.cxx @@ -33,8 +33,8 @@ #include "lights.hxx" -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cout; +using std::endl; // calculate the runway light direction vector. We take the center of diff --git a/src/Airports/GenAirports/main.cxx b/src/Airports/GenAirports/main.cxx index f6f715b7..5af953f0 100644 --- a/src/Airports/GenAirports/main.cxx +++ b/src/Airports/GenAirports/main.cxx @@ -35,15 +35,15 @@ #include #include -SG_USING_STD(vector); +using std::vector; #include #include -#include STL_STRING -#include STL_IOSTREAM +#include +#include -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cout; +using std::endl; #include #include diff --git a/src/Airports/GenAirports/texparams.hxx b/src/Airports/GenAirports/texparams.hxx index b77711d1..dec7dadc 100644 --- a/src/Airports/GenAirports/texparams.hxx +++ b/src/Airports/GenAirports/texparams.hxx @@ -36,9 +36,6 @@ #include -SG_USING_STD(vector); - - class TGTexParams { private: @@ -95,7 +92,7 @@ public: }; -typedef vector < TGTexParams > texparams_list; +typedef std::vector < TGTexParams > texparams_list; typedef texparams_list::iterator texparams_list_iterator; typedef texparams_list::const_iterator const_texparams_list_iterator; diff --git a/src/BuildTiles/Clipper/clipper.cxx b/src/BuildTiles/Clipper/clipper.cxx index 7557693c..96615061 100644 --- a/src/BuildTiles/Clipper/clipper.cxx +++ b/src/BuildTiles/Clipper/clipper.cxx @@ -37,10 +37,10 @@ #include "clipper.hxx" -#include STL_IOSTREAM +#include -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cout; +using std::endl; #define MASK_CLIP 1 diff --git a/src/BuildTiles/Clipper/clipper.hxx b/src/BuildTiles/Clipper/clipper.hxx index 58333a85..1fbd9721 100644 --- a/src/BuildTiles/Clipper/clipper.hxx +++ b/src/BuildTiles/Clipper/clipper.hxx @@ -39,12 +39,7 @@ #include #include -#include STL_STRING -#include - -SG_USING_STD(string); -SG_USING_STD(vector); - +#include #define TG_MAX_AREA_TYPES 128 // FIXME also defined in // MergerClipper/clipper.hxx @@ -79,10 +74,10 @@ public: bool init(); // Load a polygon definition file - bool load_polys(const string& path); + bool load_polys(const std::string& path); // Load an Osgb36 polygon definition file - bool load_osgb36_polys(const string& path); + bool load_osgb36_polys(const std::string& path); // Add a polygon. void add_poly(int area, const TGPolygon &poly); diff --git a/src/BuildTiles/Clipper/priorities.cxx b/src/BuildTiles/Clipper/priorities.cxx index 270e0bda..8666169a 100644 --- a/src/BuildTiles/Clipper/priorities.cxx +++ b/src/BuildTiles/Clipper/priorities.cxx @@ -24,12 +24,12 @@ #include #include -#include STL_STRING +#include #include "priorities.hxx" -SG_USING_STD(string); -SG_USING_STD(map); +using std::string; +using std::map; typedef map area_type_map; typedef map area_name_map; diff --git a/src/BuildTiles/Clipper/priorities.hxx b/src/BuildTiles/Clipper/priorities.hxx index e6beb6b7..d57649b2 100644 --- a/src/BuildTiles/Clipper/priorities.hxx +++ b/src/BuildTiles/Clipper/priorities.hxx @@ -27,10 +27,7 @@ #include -#include STL_STRING - -SG_USING_STD(string); - +#include // Posible shape file types. Note the order of these is important and // defines the priority of these shapes if they should intersect. The @@ -102,10 +99,10 @@ enum AreaType { // return area type from text name -AreaType get_area_type( const string &area ); +AreaType get_area_type( const std::string &area ); // return text form of area name -string get_area_name( AreaType area ); +std::string get_area_name( AreaType area ); #endif // _PRIORITIES_HXX diff --git a/src/BuildTiles/Clipper/testclipper.cxx b/src/BuildTiles/Clipper/testclipper.cxx index 1d87a9dd..6b0a2c0e 100644 --- a/src/BuildTiles/Clipper/testclipper.cxx +++ b/src/BuildTiles/Clipper/testclipper.cxx @@ -27,8 +27,8 @@ #include "clipper.hxx" -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cout; +using std::endl; int main( int argc, char **argv ) { diff --git a/src/BuildTiles/GenOutput/genobj.cxx b/src/BuildTiles/GenOutput/genobj.cxx index 0131b38c..73250126 100644 --- a/src/BuildTiles/GenOutput/genobj.cxx +++ b/src/BuildTiles/GenOutput/genobj.cxx @@ -40,8 +40,8 @@ #include "genobj.hxx" -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cout; +using std::endl; // calculate the global bounding sphere. Center is the center of the diff --git a/src/BuildTiles/GenOutput/genobj.hxx b/src/BuildTiles/GenOutput/genobj.hxx index f4c7e130..3a4ff16b 100644 --- a/src/BuildTiles/GenOutput/genobj.hxx +++ b/src/BuildTiles/GenOutput/genobj.hxx @@ -33,8 +33,6 @@ #include -#include STL_STRING - #include #include #include @@ -44,11 +42,7 @@ #include
#include -SG_USING_STD(string); -SG_USING_STD(vector); - - -typedef vector < int_list > tex_list; +typedef std::vector < int_list > tex_list; typedef tex_list::iterator tex_list_iterator; typedef tex_list::const_iterator const_tex_list_iterator; diff --git a/src/BuildTiles/Main/construct.hxx b/src/BuildTiles/Main/construct.hxx index 71713cdc..3defb05b 100644 --- a/src/BuildTiles/Main/construct.hxx +++ b/src/BuildTiles/Main/construct.hxx @@ -37,7 +37,8 @@ #include -#include STL_STRING +#include +#include #include @@ -48,10 +49,7 @@ #include #include -SG_USING_STD(string); - - -typedef vector < int_list > belongs_to_list; +typedef std::vector < int_list > belongs_to_list; typedef belongs_to_list::iterator belongs_to_list_iterator; typedef belongs_to_list::const_iterator belongs_to_list_tripoly_iterator; @@ -61,11 +59,11 @@ class TGConstruct { private: // path to land-cover file (if any) - string cover; + std::string cover; // paths - string work_base; - string output_base; + std::string work_base; + std::string output_base; // flag indicating whether to align texture coords within the UK // with the UK grid @@ -119,14 +117,14 @@ public: ~TGConstruct(); // land cover file - inline string get_cover () const { return cover; } - inline void set_cover (const string &s) { cover = s; } + inline std::string get_cover () const { return cover; } + inline void set_cover (const std::string &s) { cover = s; } // paths - inline string get_work_base() const { return work_base; } - inline void set_work_base( const string s ) { work_base = s; } - inline string get_output_base() const { return output_base; } - inline void set_output_base( const string s ) { output_base = s; } + inline std::string get_work_base() const { return work_base; } + inline void set_work_base( const std::string s ) { work_base = s; } + inline std::string get_output_base() const { return output_base; } + inline void set_output_base( const std::string s ) { output_base = s; } // UK grid flag inline bool get_useUKGrid() const { return useUKGrid; } diff --git a/src/BuildTiles/Main/main.cxx b/src/BuildTiles/Main/main.cxx index 412727ba..da3d2771 100644 --- a/src/BuildTiles/Main/main.cxx +++ b/src/BuildTiles/Main/main.cxx @@ -42,8 +42,8 @@ #include -#include STL_IOSTREAM -#include STL_STRING +#include +#include #include #include @@ -63,11 +63,11 @@ #include "construct.hxx" -SG_USING_STD(cout); -SG_USING_STD(cerr); -SG_USING_STD(endl); -SG_USING_STD(string); -SG_USING_STD(vector); +using std::cout; +using std::cerr; +using std::endl; +using std::string; +using std::vector; vector load_dirs; diff --git a/src/BuildTiles/Main/master.cxx b/src/BuildTiles/Main/master.cxx index b1ccf961..57a669da 100644 --- a/src/BuildTiles/Main/master.cxx +++ b/src/BuildTiles/Main/master.cxx @@ -30,8 +30,8 @@ #include // for stat() #include // for stat() -#include STL_STRING -#include STL_IOSTREAM +#include +#include #include @@ -44,9 +44,9 @@ // #include // #include -SG_USING_STD(string); -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::string; +using std::cout; +using std::endl; // return true if file exists diff --git a/src/BuildTiles/Match/match.cxx b/src/BuildTiles/Match/match.cxx index e38e4f25..f3220085 100644 --- a/src/BuildTiles/Match/match.cxx +++ b/src/BuildTiles/Match/match.cxx @@ -36,8 +36,8 @@ #include "match.hxx" -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cout; +using std::endl; TGMatch::TGMatch( void ) { diff --git a/src/BuildTiles/Osgb36/osgb36.cxx b/src/BuildTiles/Osgb36/osgb36.cxx index c598ceab..ea16a07f 100644 --- a/src/BuildTiles/Osgb36/osgb36.cxx +++ b/src/BuildTiles/Osgb36/osgb36.cxx @@ -21,12 +21,12 @@ #include -#include STL_IOSTREAM +#include #include #include "osgb36.hxx" -SG_USING_STD(cout); +using std::cout; double DEG_TO_RAD = 2.0 * 3.14159265358979323846264338327950288419716939967511 / 360.0; double RAD_TO_DEG = 360.0 / (2.0 * 3.14159265358979323846264338327950288419716939967511); diff --git a/src/BuildTiles/Osgb36/testosgb36.cxx b/src/BuildTiles/Osgb36/testosgb36.cxx index b5b0ab15..1ba98cef 100644 --- a/src/BuildTiles/Osgb36/testosgb36.cxx +++ b/src/BuildTiles/Osgb36/testosgb36.cxx @@ -1,11 +1,11 @@ #include #include -#include STL_IOSTREAM +#include #include "osgb36.hxx" -SG_USING_STD(cout); +using std::cout; static void Usage() { cout << "Usage is testosgb36 \n"; diff --git a/src/BuildTiles/Parallel/client.cxx b/src/BuildTiles/Parallel/client.cxx index aa3265b3..c7dd8c7d 100644 --- a/src/BuildTiles/Parallel/client.cxx +++ b/src/BuildTiles/Parallel/client.cxx @@ -29,22 +29,22 @@ #include -#include STL_IOSTREAM -#include STL_STRING +#include +#include #include #include -SG_USING_STD(cout); -SG_USING_STD(cerr); -SG_USING_STD(endl); +using std::cout; +using std::cerr; +using std::endl; #define MAXBUF 1024 #define BUSY_WAIT_TIME 30 -SG_USING_STD(string); -SG_USING_STD(vector); +using std::string; +using std::vector; string work_base = "."; string output_base = "."; diff --git a/src/BuildTiles/Parallel/server.cxx b/src/BuildTiles/Parallel/server.cxx index 18549689..a0d025b2 100644 --- a/src/BuildTiles/Parallel/server.cxx +++ b/src/BuildTiles/Parallel/server.cxx @@ -7,8 +7,8 @@ #include -#include STL_IOSTREAM -#include STL_STRING +#include +#include #include #include @@ -25,10 +25,10 @@ #include -SG_USING_STD( cout ); -SG_USING_STD( cerr ); -SG_USING_STD( endl ); -SG_USING_STD( string ); +using std:: cout ; +using std:: cerr ; +using std:: endl ; +using std:: string ; #if defined (__sun) || defined (__CYGWIN__) || defined(sgi) # define WAIT_ANY (pid_t)-1 diff --git a/src/BuildTiles/Triangulate/triangle.cxx b/src/BuildTiles/Triangulate/triangle.cxx index a4dbf86e..9138b6d3 100644 --- a/src/BuildTiles/Triangulate/triangle.cxx +++ b/src/BuildTiles/Triangulate/triangle.cxx @@ -28,8 +28,8 @@ #include "triangle.hxx" -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cout; +using std::endl; // Constructor diff --git a/src/BuildTiles/Triangulate/trieles.hxx b/src/BuildTiles/Triangulate/trieles.hxx index f0cdaa1d..697a84f4 100644 --- a/src/BuildTiles/Triangulate/trieles.hxx +++ b/src/BuildTiles/Triangulate/trieles.hxx @@ -34,9 +34,6 @@ #include -SG_USING_STD(vector); - - // a segment is two integer pointers into the node list class TGTriEle { int n1, n2, n3; @@ -65,7 +62,7 @@ public: }; -typedef vector < TGTriEle > triele_list; +typedef std::vector < TGTriEle > triele_list; typedef triele_list::iterator triele_list_iterator; typedef triele_list::const_iterator const_triele_list_iterator; diff --git a/src/Lib/Array/array.cxx b/src/Lib/Array/array.cxx index 4d25752d..13f63c28 100644 --- a/src/Lib/Array/array.cxx +++ b/src/Lib/Array/array.cxx @@ -27,8 +27,8 @@ #include -#include STL_IOSTREAM -#include STL_STRING +#include +#include #include #include @@ -41,9 +41,9 @@ #include "array.hxx" -SG_USING_STD(string); -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::string; +using std::cout; +using std::endl; TGArray::TGArray( void ): diff --git a/src/Lib/Array/array.hxx b/src/Lib/Array/array.hxx index 6f5d7081..972274ff 100644 --- a/src/Lib/Array/array.hxx +++ b/src/Lib/Array/array.hxx @@ -35,17 +35,11 @@ #include -#include - #include #include #include #include - -SG_USING_STD(vector); - - #define ARRAY_SIZE_1 1201 diff --git a/src/Lib/Array/testarray.cxx b/src/Lib/Array/testarray.cxx index 3586507b..00f8f822 100644 --- a/src/Lib/Array/testarray.cxx +++ b/src/Lib/Array/testarray.cxx @@ -1,11 +1,11 @@ #include #include -#include STL_IOSTREAM +#include #include "array.hxx" -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cout; +using std::endl; int main( int argc, char **argv ) { double lon, lat; diff --git a/src/Lib/DEM/dem.cxx b/src/Lib/DEM/dem.cxx index ffc7f001..b6283de9 100644 --- a/src/Lib/DEM/dem.cxx +++ b/src/Lib/DEM/dem.cxx @@ -33,7 +33,7 @@ #include #include -#include STL_IOSTREAM +#include #ifdef HAVE_SYS_STAT_H # include // stat() @@ -59,8 +59,8 @@ #include "dem.hxx" -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cout; +using std::endl; TGDem::TGDem() : diff --git a/src/Lib/DEM/dem.hxx b/src/Lib/DEM/dem.hxx index 162672d2..da96192d 100644 --- a/src/Lib/DEM/dem.hxx +++ b/src/Lib/DEM/dem.hxx @@ -38,7 +38,7 @@ #include #include -#include STL_STRING +#include #define DEM_SIZE 1200 #define DEM_SIZE_1 1201 diff --git a/src/Lib/Geometry/contour_tree.hxx b/src/Lib/Geometry/contour_tree.hxx index 19a6ce03..1579523b 100644 --- a/src/Lib/Geometry/contour_tree.hxx +++ b/src/Lib/Geometry/contour_tree.hxx @@ -35,13 +35,10 @@ #include -SG_USING_STD(vector); - - // forward declaration class TGContourNode; -typedef vector < TGContourNode * > contour_kids; +typedef std::vector < TGContourNode * > contour_kids; typedef contour_kids::iterator contour_kids_iterator; typedef contour_kids::const_iterator const_contour_kids_iterator; diff --git a/src/Lib/Geometry/line.hxx b/src/Lib/Geometry/line.hxx index f28fe674..b4e89ea1 100644 --- a/src/Lib/Geometry/line.hxx +++ b/src/Lib/Geometry/line.hxx @@ -15,7 +15,6 @@ #include #include -SG_USING_STD(vector); #include "rectangle.hxx" @@ -85,7 +84,7 @@ public: virtual Rectangle getBounds () const; private: - vector _points; + std::vector _points; }; }; diff --git a/src/Lib/Geometry/poly_support.cxx b/src/Lib/Geometry/poly_support.cxx index 88351b73..401ea848 100644 --- a/src/Lib/Geometry/poly_support.cxx +++ b/src/Lib/Geometry/poly_support.cxx @@ -50,11 +50,11 @@ extern "C" { #include "trinodes.hxx" #include "trisegs.hxx" -SG_USING_STD(cout); -SG_USING_STD(endl); -SG_USING_STD(sort); -SG_USING_STD(copy); -SG_USING_STD(ostream_iterator); +using std::cout; +using std::endl; +using std::sort; +using std::copy; +using std::ostream_iterator; // Given a line segment specified by two endpoints p1 and p2, return // the slope of the line. diff --git a/src/Lib/Geometry/trisegs.cxx b/src/Lib/Geometry/trisegs.cxx index d66d403c..a9fcc5dc 100644 --- a/src/Lib/Geometry/trisegs.cxx +++ b/src/Lib/Geometry/trisegs.cxx @@ -24,14 +24,14 @@ #include #include -#include STL_IOSTREAM +#include #include "trinodes.hxx" #include "trisegs.hxx" -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cout; +using std::endl; // Constructor diff --git a/src/Lib/Geometry/trisegs.hxx b/src/Lib/Geometry/trisegs.hxx index 6110832d..15b2f317 100644 --- a/src/Lib/Geometry/trisegs.hxx +++ b/src/Lib/Geometry/trisegs.hxx @@ -36,9 +36,6 @@ #include "trinodes.hxx" -SG_USING_STD(vector); - - // a segment is two integer pointers into the node list class TGTriSeg { int n1, n2; // indices into point list @@ -75,7 +72,7 @@ inline bool operator == (const TGTriSeg& a, const TGTriSeg& b) } -typedef vector < TGTriSeg > triseg_list; +typedef std::vector < TGTriSeg > triseg_list; typedef triseg_list::iterator triseg_list_iterator; typedef triseg_list::const_iterator const_triseg_list_iterator; diff --git a/src/Lib/Geometry/util.hxx b/src/Lib/Geometry/util.hxx index efc188a9..7c0c985f 100644 --- a/src/Lib/Geometry/util.hxx +++ b/src/Lib/Geometry/util.hxx @@ -15,7 +15,6 @@ #include #include -SG_USING_STD(string); #include @@ -109,7 +108,7 @@ Rectangle makeBounds (const TGPolygon &polygon); * @param s The string. * @return A rectangle containing the bounds. */ -Rectangle parseChunk (const string &s, double delta); +Rectangle parseChunk (const std::string &s, double delta); /** @@ -118,7 +117,7 @@ Rectangle parseChunk (const string &s, double delta); * @param s The string. * @return A rectangle containing the bounds. */ -Rectangle parseTile (const string &s); +Rectangle parseTile (const std::string &s); }; // namespace tg diff --git a/src/Lib/HGT/hgt.cxx b/src/Lib/HGT/hgt.cxx index 162d2872..6765ae78 100644 --- a/src/Lib/HGT/hgt.cxx +++ b/src/Lib/HGT/hgt.cxx @@ -28,7 +28,7 @@ #include #include // atof() -#include STL_IOSTREAM +#include #ifdef SG_HAVE_STD_INCLUDES # include @@ -45,8 +45,8 @@ #include "hgt.hxx" -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cout; +using std::endl; TGHgt::TGHgt( int _res ) { diff --git a/src/Lib/HGT/hgt.hxx b/src/Lib/HGT/hgt.hxx index e9462ec1..cd7ba99f 100644 --- a/src/Lib/HGT/hgt.hxx +++ b/src/Lib/HGT/hgt.hxx @@ -32,13 +32,11 @@ #include -#include STL_STRING +#include #include #include -SG_USING_STD(string); - #define MAX_HGT_SIZE 3601 @@ -65,7 +63,7 @@ private: int hgt_resolution; bool remove_tmp_file; - string remove_file_name; + std::string remove_file_name; public: @@ -89,10 +87,10 @@ 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 write_area( const std::string& root, SGBucket& b ); // write the entire area out in a simple ascii format - bool write_whole_ascii( const string& file ); + bool write_whole_ascii( const std::string& file ); // Informational methods inline double get_originx() const { return originx; } diff --git a/src/Lib/Optimize/genfans.cxx b/src/Lib/Optimize/genfans.cxx index 1aaaf522..07ab8596 100644 --- a/src/Lib/Optimize/genfans.cxx +++ b/src/Lib/Optimize/genfans.cxx @@ -23,12 +23,12 @@ #include -#include STL_IOSTREAM +#include #include "genfans.hxx" -SG_USING_STD( cout ); -SG_USING_STD( endl ); +using std:: cout ; +using std:: endl ; // make sure the list is expanded at least to hold "n" and then push diff --git a/src/Lib/Optimize/genfans.hxx b/src/Lib/Optimize/genfans.hxx index 1811d37e..9f4914a4 100644 --- a/src/Lib/Optimize/genfans.hxx +++ b/src/Lib/Optimize/genfans.hxx @@ -38,10 +38,7 @@ #include -SG_USING_STD(vector); - - -typedef vector < int_list > opt_list; +typedef std::vector < int_list > opt_list; typedef opt_list::iterator opt_list_iterator; typedef opt_list::const_iterator const_opt_list_iterator; diff --git a/src/Lib/Optimize/genstrips.hxx b/src/Lib/Optimize/genstrips.hxx index f36c71b3..9becc35f 100644 --- a/src/Lib/Optimize/genstrips.hxx +++ b/src/Lib/Optimize/genstrips.hxx @@ -39,10 +39,7 @@ #include -SG_USING_STD(vector); - - -typedef vector < int_list > opt_list; +typedef std::vector < int_list > opt_list; typedef opt_list::iterator opt_list_iterator; typedef opt_list::const_iterator const_opt_list_iterator; diff --git a/src/Lib/Output/output.cxx b/src/Lib/Output/output.cxx index 8cc26b66..e3d63d33 100644 --- a/src/Lib/Output/output.cxx +++ b/src/Lib/Output/output.cxx @@ -33,7 +33,7 @@ #include #include -#include STL_STRING +#include #include @@ -45,8 +45,8 @@ # include #endif -SG_USING_STD( cout ); -SG_USING_STD( endl ); +using std:: cout ; +using std:: endl ; void write_polygon( const TGPolygon& poly, const string& base ) { diff --git a/src/Lib/Output/output.hxx b/src/Lib/Output/output.hxx index a6691735..db3be7a9 100644 --- a/src/Lib/Output/output.hxx +++ b/src/Lib/Output/output.hxx @@ -37,7 +37,7 @@ #include #include -#include STL_STRING +#include #include diff --git a/src/Lib/Polygon/chop-bin.cxx b/src/Lib/Polygon/chop-bin.cxx index fc1ceec9..2c3e4d83 100644 --- a/src/Lib/Polygon/chop-bin.cxx +++ b/src/Lib/Polygon/chop-bin.cxx @@ -29,11 +29,11 @@ #include -#include STL_STRING -#include STL_IOSTREAM +#include +#include -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cout; +using std::endl; #include #include diff --git a/src/Lib/Polygon/index.cxx b/src/Lib/Polygon/index.cxx index 70743ec8..f1848a77 100644 --- a/src/Lib/Polygon/index.cxx +++ b/src/Lib/Polygon/index.cxx @@ -23,16 +23,17 @@ #include #include -#include STL_STRING +#include #include #include "index.hxx" +using std::string; + static long int poly_index; static string poly_path; - // initialize the unique polygon index counter stored in path bool poly_index_init( string path ) { poly_path = path; diff --git a/src/Lib/Polygon/index.hxx b/src/Lib/Polygon/index.hxx index c6600863..7bac2349 100644 --- a/src/Lib/Polygon/index.hxx +++ b/src/Lib/Polygon/index.hxx @@ -27,13 +27,10 @@ #include -#include STL_STRING - -SG_USING_STD(string); - +#include // initialize the unique polygon index counter stored in path -bool poly_index_init( string path ); +bool poly_index_init( std::string path ); // increment the persistant counter and return the next poly_index long int poly_index_next(); diff --git a/src/Lib/Polygon/names.hxx b/src/Lib/Polygon/names.hxx index ed0b4e61..20bc3245 100644 --- a/src/Lib/Polygon/names.hxx +++ b/src/Lib/Polygon/names.hxx @@ -27,21 +27,19 @@ #include -#include STL_STRING +#include -SG_USING_STD(string); - -inline static bool is_ocean_area( const string &area ) +inline static bool is_ocean_area( const std::string &area ) { return area=="Ocean" || area=="Bay Estuary or Ocean"; } -inline static bool is_void_area( const string &area ) +inline static bool is_void_area( const std::string &area ) { return area=="Void Area"; } -inline static bool is_null_area( const string& area ) +inline static bool is_null_area( const std::string& area ) { return area=="Null"; } diff --git a/src/Lib/Polygon/polygon.cxx b/src/Lib/Polygon/polygon.cxx index 2190dd05..4d235415 100644 --- a/src/Lib/Polygon/polygon.cxx +++ b/src/Lib/Polygon/polygon.cxx @@ -35,7 +35,7 @@ extern "C" { #include #include -SG_USING_STD(endl); +using std::endl; #include #include diff --git a/src/Lib/Polygon/polygon.hxx b/src/Lib/Polygon/polygon.hxx index 2ea424f6..a2c56cfe 100644 --- a/src/Lib/Polygon/polygon.hxx +++ b/src/Lib/Polygon/polygon.hxx @@ -33,21 +33,16 @@ #include #include -#include STL_IOSTREAM -#include STL_STRING +#include +#include #include #include "point2d.hxx" -SG_USING_STD(ostream); -SG_USING_STD(string); -SG_USING_STD(vector); - - #define FG_MAX_VERTICES 1500000 -typedef vector < point_list > polytype; +typedef std::vector < point_list > polytype; typedef polytype::iterator polytype_iterator; typedef polytype::const_iterator const_polytype_iterator; @@ -182,14 +177,14 @@ public: bool is_inside( int a, int b ) const; // output - void write( const string& file ) const; + void write( const std::string& file ) const; // output - void write_contour( const int contour, const string& file ) const; + void write_contour( const int contour, const std::string& file ) const; }; -typedef vector < TGPolygon > poly_list; +typedef std::vector < TGPolygon > poly_list; typedef poly_list::iterator poly_list_iterator; typedef poly_list::const_iterator const_poly_list_iterator; @@ -234,7 +229,7 @@ TGPolygon tgPolygonXor( const TGPolygon& subject, const TGPolygon& clip ); TGPolygon tgPolygonUnion( const TGPolygon& subject, const TGPolygon& clip ); // Output -ostream &operator<< (ostream &output, const TGPolygon &poly); +std::ostream &operator<< (std::ostream &output, const TGPolygon &poly); #endif // _POLYGON_HXX diff --git a/src/Lib/Polygon/superpoly.hxx b/src/Lib/Polygon/superpoly.hxx index a5cbc8ad..c08d7895 100644 --- a/src/Lib/Polygon/superpoly.hxx +++ b/src/Lib/Polygon/superpoly.hxx @@ -43,21 +43,17 @@ #include "polygon.hxx" -SG_USING_STD(string); -SG_USING_STD(vector); - - class TGSuperPoly { private: - string material; // material/texture name + std::string material; // material/texture name TGPolygon poly; // master polygon TGPolygon normals; // corresponding normals TGPolygon texcoords; // corresponding texture coordinates TGPolygon tris; // triangulation GLenum tri_mode; // GL_TRIANGLE, GL_FAN, GL_TRISTRIP, etc. - string flag; // For various potential record keeping needs + std::string flag; // For various potential record keeping needs public: @@ -65,8 +61,8 @@ public: TGSuperPoly( void ); ~TGSuperPoly( void ); - inline string get_material() const { return material; } - inline void set_material( const string &m ) { material = m; } + inline std::string get_material() const { return material; } + inline void set_material( const std::string &m ) { material = m; } inline TGPolygon get_poly() const { return poly; } inline void set_poly( const TGPolygon &p ) { poly = p; } @@ -83,8 +79,8 @@ public: inline GLenum get_tri_mode() const { return tri_mode; } inline void set_tri_mode( const GLenum &m ) { tri_mode = m; } - inline string get_flag() const { return flag; } - inline void set_flag( const string f ) { flag = f; } + inline std::string get_flag() const { return flag; } + inline void set_flag( const std::string f ) { flag = f; } // erase the polygon void erase(); @@ -92,7 +88,7 @@ public: }; -typedef vector < TGSuperPoly > superpoly_list; +typedef std::vector < TGSuperPoly > superpoly_list; typedef superpoly_list::iterator superpoly_list_iterator; typedef superpoly_list::const_iterator const_superpoly_list_iterator; diff --git a/src/Lib/e00/e00.cxx b/src/Lib/e00/e00.cxx index 00f913d2..b2a7247d 100644 --- a/src/Lib/e00/e00.cxx +++ b/src/Lib/e00/e00.cxx @@ -6,20 +6,20 @@ #include #include -#include STL_STRING -#include STL_IOSTREAM +#include +#include #include #include #include -SG_USING_STD(vector); -SG_USING_STD(map); -SG_USING_STD(string); -SG_USING_STD(istream); -SG_USING_STD(cerr); -SG_USING_STD(endl); -SG_USING_STD(getline); +using std::vector; +using std::map; +using std::string; +using std::istream; +using std::cerr; +using std::endl; +using std::getline; //////////////////////////////////////////////////////////////////////// diff --git a/src/Lib/e00/e00.hxx b/src/Lib/e00/e00.hxx index f94398fa..db906259 100644 --- a/src/Lib/e00/e00.hxx +++ b/src/Lib/e00/e00.hxx @@ -6,23 +6,18 @@ #include #include -#include STL_STRING -#include STL_IOSTREAM - -SG_USING_STD(vector); -SG_USING_STD(string); -SG_USING_STD(istream); - +#include +#include // An exception reading an E00 file. class E00Exception { public: - E00Exception (const string &message) : _message(message) {} - virtual const string &getMessage () const { return _message; } + E00Exception (const std::string &message) : _message(message) {} + virtual const std::string &getMessage () const { return _message; } private: - string _message; + std::string _message; }; @@ -61,7 +56,7 @@ public: int leftPolygon; int rightPolygon; int numberOfCoordinates; - vector coordinates; + std::vector coordinates; bool in_polygon; }; @@ -73,7 +68,7 @@ public: virtual ~CNT () {} int numLabels; Coord centroid; - vector labels; + std::vector labels; }; @@ -95,7 +90,7 @@ public: struct LOG { virtual ~LOG () {} - vector lines; + std::vector lines; }; @@ -113,7 +108,7 @@ public: int numArcs; Coord min; Coord max; - vector arcs; + std::vector arcs; }; @@ -122,7 +117,7 @@ public: struct PRJ { virtual ~PRJ () {} - vector lines; + std::vector lines; }; @@ -144,33 +139,33 @@ public: virtual ~IFO () {} struct ItemDef { - string itemName; + std::string itemName; int itemWidth; // followed by -1 int itemStartPos; // followed by 4-1 int itemOutputFormat[2]; - string itemType; + std::string itemType; // -1 // -1-1 - string seqId; + std::string seqId; }; - typedef vector Entry; - string fileName; - string isArcInfo; + typedef std::vector Entry; + std::string fileName; + std::string isArcInfo; int numItems; int altNumItems; int dataRecordLength; int numDataRecords; - vector defs; - vector entries; + std::vector defs; + std::vector entries; }; E00 (); virtual ~E00 (); - virtual void readE00 (istream &input); + virtual void readE00 (std::istream &input); - virtual string getPathName () const { return pathName; } + virtual std::string getPathName () const { return pathName; } virtual int nPoints () const { return lab_section.size(); } virtual int nLines () const { return arc_section.size(); } @@ -181,28 +176,28 @@ public: virtual const LAB &getLAB (int i) const { return lab_section[i-1]; } virtual const PAL &getPAL (int i) const { return pal_section[i-1]; } virtual const IFO &getIFO (int i) const { return ifo_section[i-1]; } - virtual const IFO * getIFO (const string &name) const; - virtual const string * getIFOItem (const string &fileName, int entry, - const string &itemName) const; - virtual const string * getIFOItemType (const string &fileName, - const string &itemName) const; + virtual const IFO * getIFO (const std::string &name) const; + virtual const std::string * getIFOItem (const std::string &fileName, int entry, + const std::string &itemName) const; + virtual const std::string * getIFOItemType (const std::string &fileName, + const std::string &itemName) const; private: virtual ARC &_getARC (int i) { return arc_section[i-1]; } - string pathName; - vector arc_section; - vector cnt_section; - vector lab_section; - vector log_section; - vector pal_section; - vector prj_section; - vector tol_section; - vector ifo_section; + std::string pathName; + std::vector arc_section; + std::vector cnt_section; + std::vector lab_section; + std::vector log_section; + std::vector pal_section; + std::vector prj_section; + std::vector tol_section; + std::vector ifo_section; - mutable istream * _input; + mutable std::istream * _input; void postProcess (); diff --git a/src/Lib/e00/teste00.cxx b/src/Lib/e00/teste00.cxx index be4dd4ca..f4e78af5 100644 --- a/src/Lib/e00/teste00.cxx +++ b/src/Lib/e00/teste00.cxx @@ -9,9 +9,9 @@ #include #include "e00.hxx" -SG_USING_STD(cerr); -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cerr; +using std::cout; +using std::endl; int main (int ac, const char ** av) { diff --git a/src/Lib/landcover/landcover.cxx b/src/Lib/landcover/landcover.cxx index 6b2e63b2..1d10ef9e 100644 --- a/src/Lib/landcover/landcover.cxx +++ b/src/Lib/landcover/landcover.cxx @@ -5,13 +5,13 @@ // Use at your own risk. #include -#include STL_STRING +#include #include "landcover.hxx" -SG_USING_STD(ifstream); -SG_USING_STD(string); +using std::ifstream; +using std::string; LandCover::LandCover( const string &filename ) { diff --git a/src/Lib/landcover/landcover.hxx b/src/Lib/landcover/landcover.hxx index 6602ef80..a6f72fcc 100644 --- a/src/Lib/landcover/landcover.hxx +++ b/src/Lib/landcover/landcover.hxx @@ -9,12 +9,8 @@ #include -#include STL_STRING -#include STL_FSTREAM - -SG_USING_STD(ifstream); -SG_USING_STD(string); - +#include +#include /** * Query class for the USGS worldwide 30 arcsec land-cover image. @@ -65,7 +61,7 @@ class LandCover { public: - LandCover( const string &filename ); + LandCover( const std::string &filename ); virtual ~LandCover (); virtual int getValue (long x, long y) const; @@ -73,7 +69,7 @@ public: virtual const char *getDescUSGS (int value) const; private: - mutable ifstream * _input; + mutable std::ifstream * _input; long WIDTH; long HEIGHT; }; diff --git a/src/Lib/landcover/test-landcover.cxx b/src/Lib/landcover/test-landcover.cxx index 17ecf93f..ae54f3c1 100644 --- a/src/Lib/landcover/test-landcover.cxx +++ b/src/Lib/landcover/test-landcover.cxx @@ -7,15 +7,15 @@ #include -#include STL_IOSTREAM -#include STL_STRING +#include +#include #include "landcover.hxx" -SG_USING_STD(cerr); -SG_USING_STD(cout); -SG_USING_STD(endl); -SG_USING_STD(string); +using std::cerr; +using std::cout; +using std::endl; +using std::string; int main (int ac, const char * av[]) diff --git a/src/Lib/vpf/table.cxx b/src/Lib/vpf/table.cxx index 24e0db0a..513a742b 100644 --- a/src/Lib/vpf/table.cxx +++ b/src/Lib/vpf/table.cxx @@ -3,16 +3,16 @@ #include -#include STL_STRING -#include STL_FSTREAM +#include +#include #include // ios_binary #include -SG_USING_STD(string); -SG_USING_STD(ifstream); -SG_USING_STD(istream); +using std::string; +using std::ifstream; +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 35f22b4e..9798d0dd 100644 --- a/src/Lib/vpf/vpf-topology.cxx +++ b/src/Lib/vpf/vpf-topology.cxx @@ -3,16 +3,16 @@ #include -#include STL_IOSTREAM -#include STL_STRING +#include +#include #include -SG_USING_STD(cout); -SG_USING_STD(cerr); -SG_USING_STD(endl); -SG_USING_STD(ostream); -SG_USING_STD(string); +using std::cout; +using std::cerr; +using std::endl; +using std::ostream; +using std::string; #include "vpf.hxx" diff --git a/src/Prep/DemChop/demchop.cxx b/src/Prep/DemChop/demchop.cxx index aaaeb0ed..8f1c2fb3 100644 --- a/src/Prep/DemChop/demchop.cxx +++ b/src/Prep/DemChop/demchop.cxx @@ -27,8 +27,8 @@ #include -#include STL_IOSTREAM -#include STL_STRING +#include +#include #include #include @@ -41,9 +41,9 @@ #include "point2d.hxx" -SG_USING_STD(endl); -SG_USING_STD(cout); -SG_USING_STD(string); +using std::endl; +using std::cout; +using std::string; int main(int argc, char **argv) { diff --git a/src/Prep/DemChop/fillvoids.cxx b/src/Prep/DemChop/fillvoids.cxx index fec96509..d777427d 100644 --- a/src/Prep/DemChop/fillvoids.cxx +++ b/src/Prep/DemChop/fillvoids.cxx @@ -26,8 +26,8 @@ #include -#include STL_STRING -#include STL_IOSTREAM +#include +#include #include #include @@ -35,9 +35,9 @@ #include -SG_USING_STD(cout); -SG_USING_STD(endl); -SG_USING_STD(string); +using std::cout; +using std::endl; +using std::string; int main(int argc, char **argv) { diff --git a/src/Prep/DemChop/hgtchop.cxx b/src/Prep/DemChop/hgtchop.cxx index 665c6373..b92bebd8 100644 --- a/src/Prep/DemChop/hgtchop.cxx +++ b/src/Prep/DemChop/hgtchop.cxx @@ -27,8 +27,8 @@ #include -#include STL_STRING -#include STL_IOSTREAM +#include +#include #include #include @@ -40,9 +40,9 @@ # include #endif -SG_USING_STD(cout); -SG_USING_STD(endl); -SG_USING_STD(string); +using std::cout; +using std::endl; +using std::string; int main(int argc, char **argv) { diff --git a/src/Prep/DemChop/testassem.cxx b/src/Prep/DemChop/testassem.cxx index 47cfd35f..a6554fb0 100644 --- a/src/Prep/DemChop/testassem.cxx +++ b/src/Prep/DemChop/testassem.cxx @@ -27,8 +27,8 @@ #include -#include STL_STRING -#include STL_IOSTREAM +#include +#include #include #include @@ -40,9 +40,9 @@ # include #endif -SG_USING_STD(cout); -SG_USING_STD(endl); -SG_USING_STD(string); +using std::cout; +using std::endl; +using std::string; int data[3601][3601]; diff --git a/src/Prep/DemInfo/deminfo.cxx b/src/Prep/DemInfo/deminfo.cxx index db6fa5e1..ccb3f7c4 100644 --- a/src/Prep/DemInfo/deminfo.cxx +++ b/src/Prep/DemInfo/deminfo.cxx @@ -23,8 +23,8 @@ #include -#include STL_IOSTREAM -#include STL_STRING +#include +#include #include #include @@ -32,8 +32,8 @@ #include -SG_USING_STD(cout); -SG_USING_STD(string); +using std::cout; +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 293bcee3..90ea485d 100644 --- a/src/Prep/E00Lines/main.cxx +++ b/src/Prep/E00Lines/main.cxx @@ -33,15 +33,15 @@ #include #include -#include STL_IOSTREAM -#include STL_STRING +#include +#include #include -SG_USING_STD(cerr); -SG_USING_STD(cout); -SG_USING_STD(endl); -SG_USING_STD(string); -SG_USING_STD(vector); +using std::cerr; +using std::cout; +using std::endl; +using std::string; +using std::vector; #include #include diff --git a/src/Prep/GSHHS/debug.cxx b/src/Prep/GSHHS/debug.cxx index 8d449c70..1882676c 100644 --- a/src/Prep/GSHHS/debug.cxx +++ b/src/Prep/GSHHS/debug.cxx @@ -29,8 +29,8 @@ #include -#include STL_STRING -#include STL_IOSTREAM +#include +#include #include @@ -47,9 +47,9 @@ # define FLIP #endif -SG_USING_STD(cout); -SG_USING_STD(cin); -SG_USING_STD(endl); +using std::cout; +using std::cin; +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 f486f9be..fea99880 100644 --- a/src/Prep/GSHHS/gshhs_split.cxx +++ b/src/Prep/GSHHS/gshhs_split.cxx @@ -26,8 +26,8 @@ #include -#include STL_STRING -#include STL_IOSTREAM +#include +#include #include #include @@ -39,9 +39,9 @@ #include "gshhs_split.hxx" -SG_USING_STD(cout); -SG_USING_STD(endl); -SG_USING_STD(string); +using std::cout; +using std::endl; +using std::string; // process shape front end ... split shape into lon = -180 ... 180, diff --git a/src/Prep/GSHHS/main.cxx b/src/Prep/GSHHS/main.cxx index 8af3c465..b9988348 100644 --- a/src/Prep/GSHHS/main.cxx +++ b/src/Prep/GSHHS/main.cxx @@ -29,8 +29,8 @@ #include -#include STL_IOSTREAM -#include STL_STRING +#include +#include #include @@ -46,9 +46,9 @@ #include "gshhs.h" #include "gshhs_split.hxx" -SG_USING_STD( string ); -SG_USING_STD( cout ); -SG_USING_STD( endl ); +using std:: string ; +using std:: cout ; +using std:: endl ; // hackity, hackity, hack ... cough cough #ifdef i386 diff --git a/src/Prep/MergerClipper/merger.cxx b/src/Prep/MergerClipper/merger.cxx index 33753ce8..c533315b 100644 --- a/src/Prep/MergerClipper/merger.cxx +++ b/src/Prep/MergerClipper/merger.cxx @@ -39,7 +39,7 @@ #include "merger.hxx" -SG_USING_STD(cout); +using std::cout; // Constructor FGMerger::FGMerger( void ) { diff --git a/src/Prep/MergerClipper/merger.hxx b/src/Prep/MergerClipper/merger.hxx index 5b3596e4..801674a0 100644 --- a/src/Prep/MergerClipper/merger.hxx +++ b/src/Prep/MergerClipper/merger.hxx @@ -37,11 +37,7 @@ #include #include -#include STL_STRING -#include - -SG_USING_STD(string); -SG_USING_STD(vector); +#include #define FG_MAX_AREA_TYPES 128 // FIXME: also defined in clipper.hxx @@ -70,14 +66,14 @@ public: // Initialize Clipper (allocate and/or connect structures) bool init(); - bool load_polys(const string& path, FGPolyList& clipped); + bool load_polys(const std::string& path, FGPolyList& clipped); // Merge all polygons of the given area void merge(FGPolyList& clipped); // Clip all merged polygons with the land mass one void clip(FGPolyList& subject, FGPolyList& clip); - void write(FGPolyList& subject, string& file); + void write(FGPolyList& subject, std::string& file); inline FGPolyList get_polys_clipped() const { return polys_subject; } diff --git a/src/Prep/MergerClipper/testmerger.cxx b/src/Prep/MergerClipper/testmerger.cxx index 7e06dbbf..c98d02f5 100644 --- a/src/Prep/MergerClipper/testmerger.cxx +++ b/src/Prep/MergerClipper/testmerger.cxx @@ -33,8 +33,8 @@ #include "merger.hxx" -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cout; +using std::endl; int main( int argc, char **argv ) { point2d global_min, global_max; diff --git a/src/Prep/OGRDecode/ogr-decode.cxx b/src/Prep/OGRDecode/ogr-decode.cxx index 3ce7fb10..94882783 100644 --- a/src/Prep/OGRDecode/ogr-decode.cxx +++ b/src/Prep/OGRDecode/ogr-decode.cxx @@ -26,7 +26,7 @@ #include -#include STL_STRING +#include #include #include @@ -45,9 +45,9 @@ # include #endif -SG_USING_STD( cout ); -SG_USING_STD( string ); -SG_USING_STD( map ); +using std:: cout ; +using std:: string ; +using std:: map ; int line_width=50; string line_width_col; diff --git a/src/Prep/Photo/findcorners.cxx b/src/Prep/Photo/findcorners.cxx index 13885aa7..12e43b98 100644 --- a/src/Prep/Photo/findcorners.cxx +++ b/src/Prep/Photo/findcorners.cxx @@ -8,8 +8,8 @@ #include -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cout; +using std::endl; #include diff --git a/src/Prep/Photo/photo.cxx b/src/Prep/Photo/photo.cxx index f149c82f..c482ce91 100644 --- a/src/Prep/Photo/photo.cxx +++ b/src/Prep/Photo/photo.cxx @@ -29,8 +29,8 @@ #include #include -#include STL_STRING -#include STL_IOSTREAM +#include +#include #include #include @@ -44,9 +44,9 @@ #include #include -SG_USING_STD(string); -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::string; +using std::cout; +using std::endl; const int MAX_XDIV = 16; diff --git a/src/Prep/Photo/wgs84offset.cxx b/src/Prep/Photo/wgs84offset.cxx index 3e5b49c8..4c85d643 100644 --- a/src/Prep/Photo/wgs84offset.cxx +++ b/src/Prep/Photo/wgs84offset.cxx @@ -2,15 +2,15 @@ #include -#include STL_IOSTREAM +#include #include #include #include -SG_USING_STD(cout); -SG_USING_STD(endl); +using std::cout; +using std::endl; int main( int argc, char **argv ) { diff --git a/src/Prep/ShapeFile/noaa-decode.cxx b/src/Prep/ShapeFile/noaa-decode.cxx index 1f56c8f4..a71c73cf 100644 --- a/src/Prep/ShapeFile/noaa-decode.cxx +++ b/src/Prep/ShapeFile/noaa-decode.cxx @@ -25,7 +25,7 @@ #include -#include STL_STRING +#include #include @@ -38,8 +38,8 @@ # include #endif -SG_USING_STD( cout ); -SG_USING_STD( string ); +using std:: cout ; +using std:: string ; // return the type of the shapefile record std::string get_shapefile_type(DBFHandle& hDBF, int rec) { diff --git a/src/Prep/ShapeFile/shape-decode.cxx b/src/Prep/ShapeFile/shape-decode.cxx index 6125eca5..35f01088 100644 --- a/src/Prep/ShapeFile/shape-decode.cxx +++ b/src/Prep/ShapeFile/shape-decode.cxx @@ -29,8 +29,8 @@ #include -#include STL_STRING -#include STL_IOSTREAM +#include +#include #include #include @@ -49,10 +49,10 @@ # include #endif -SG_USING_STD( cout ); -SG_USING_STD( endl ); -SG_USING_STD( string ); -SG_USING_STD( map ); +using std:: cout ; +using std:: endl ; +using std:: string ; +using std:: map ; map area_code_map; bool use_area_code_map = false; diff --git a/src/Prep/TGVPF/tgvpf.cxx b/src/Prep/TGVPF/tgvpf.cxx index 4d24ef15..752cae68 100644 --- a/src/Prep/TGVPF/tgvpf.cxx +++ b/src/Prep/TGVPF/tgvpf.cxx @@ -34,15 +34,15 @@ #include #include -#include STL_IOSTREAM -#include STL_STRING +#include +#include #include -SG_USING_STD(cerr); -SG_USING_STD(cout); -SG_USING_STD(endl); -SG_USING_STD(string); -SG_USING_STD(vector); +using std::cerr; +using std::cout; +using std::endl; +using std::string; +using std::vector; #include #include diff --git a/src/Prep/Terra/Mask.h b/src/Prep/Terra/Mask.h index d1b591d4..32a57fdd 100644 --- a/src/Prep/Terra/Mask.h +++ b/src/Prep/Terra/Mask.h @@ -3,7 +3,7 @@ #include -#include STL_IOSTREAM +#include using std::istream; diff --git a/src/Prep/Terra/output.cc b/src/Prep/Terra/output.cc index 8502dcc7..bd6362c5 100644 --- a/src/Prep/Terra/output.cc +++ b/src/Prep/Terra/output.cc @@ -1,17 +1,17 @@ #include -#include STL_FSTREAM +#include #include #include "terra.h" -SG_USING_STD(cerr); -SG_USING_STD(cout); -SG_USING_STD(endl); -SG_USING_STD(istream); -SG_USING_STD(ostream); -SG_USING_STD(ofstream); -SG_USING_STD(streampos); +using std::cerr; +using std::cout; +using std::endl; +using std::istream; +using std::ostream; +using std::ofstream; +using std::streampos; namespace Terra { diff --git a/src/Prep/UserDef/tguserdef.cxx b/src/Prep/UserDef/tguserdef.cxx index 62899db3..773c15cb 100644 --- a/src/Prep/UserDef/tguserdef.cxx +++ b/src/Prep/UserDef/tguserdef.cxx @@ -13,14 +13,14 @@ #include #include -#include STL_IOSTREAM +#include #include #include -SG_USING_STD(vector); -SG_USING_STD(cerr); -SG_USING_STD(endl); +using std::vector; +using std::cerr; +using std::endl; static string prog_name; static string work_dir = "."; diff --git a/src/Utils/poly2ogr/poly2ogr.cxx b/src/Utils/poly2ogr/poly2ogr.cxx index 296ab351..9c40a871 100644 --- a/src/Utils/poly2ogr/poly2ogr.cxx +++ b/src/Utils/poly2ogr/poly2ogr.cxx @@ -22,7 +22,7 @@ #include -#include STL_STRING +#include #include #include