From 7774de4939a6be4534ac8349ec462aac62635c59 Mon Sep 17 00:00:00 2001
From: Christian Schmitt <chris@ilovelinux.de>
Date: Sun, 26 Aug 2012 22:20:18 +0200
Subject: [PATCH] Adapt to SG changes

---
 src/Airports/GenAirports/build.hxx | 1 +
 src/Lib/Geometry/poly_support.cxx  | 1 +
 src/Lib/Geometry/util.cxx          | 1 +
 src/Lib/Polygon/chop-bin.cxx       | 2 ++
 src/Lib/Polygon/polygon.cxx        | 4 ++--
 src/Prep/UserDef/tguserdef.cxx     | 1 +
 6 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Airports/GenAirports/build.hxx b/src/Airports/GenAirports/build.hxx
index 03fef3e2..039a4395 100644
--- a/src/Airports/GenAirports/build.hxx
+++ b/src/Airports/GenAirports/build.hxx
@@ -32,6 +32,7 @@
 #include "global.hxx"
 #include "point2d.hxx"
 
+using std::string;
 
 // build 3d airport
 void build_airport( string airport_id, float alt_m,
diff --git a/src/Lib/Geometry/poly_support.cxx b/src/Lib/Geometry/poly_support.cxx
index e11b9231..6a0cd3ae 100644
--- a/src/Lib/Geometry/poly_support.cxx
+++ b/src/Lib/Geometry/poly_support.cxx
@@ -54,6 +54,7 @@ extern "C" {
 using std::copy;
 using std::ostream_iterator;
 using std::sort;
+using std::string;
 using std::vector;
 
 #if 0 // unused
diff --git a/src/Lib/Geometry/util.cxx b/src/Lib/Geometry/util.cxx
index 5b00b8c2..6b5b36b7 100644
--- a/src/Lib/Geometry/util.cxx
+++ b/src/Lib/Geometry/util.cxx
@@ -18,6 +18,7 @@
 
 #define MP_STRETCH  (0.000001)
 
+using std::string;
 using std::vector;
 
 namespace tg {
diff --git a/src/Lib/Polygon/chop-bin.cxx b/src/Lib/Polygon/chop-bin.cxx
index 4122d1ef..c9c0180c 100644
--- a/src/Lib/Polygon/chop-bin.cxx
+++ b/src/Lib/Polygon/chop-bin.cxx
@@ -43,6 +43,8 @@
 #include "simple_clip.hxx"
 #include "chop.hxx"
 
+using std::string;
+
 static void clip_and_write_poly( string root, long int p_index,
                                  const string &poly_type,
                                  SGBucket b, const TGPolygon& shape,
diff --git a/src/Lib/Polygon/polygon.cxx b/src/Lib/Polygon/polygon.cxx
index 3668790d..25a0f966 100644
--- a/src/Lib/Polygon/polygon.cxx
+++ b/src/Lib/Polygon/polygon.cxx
@@ -268,7 +268,7 @@ void TGPolygon::shift( double lon, double lat ) {
 
 
 // output
-void TGPolygon::write( const string& file ) const {
+void TGPolygon::write( const std::string& file ) const {
     FILE *fp = fopen( file.c_str(), "w" );
 
     fprintf(fp, "%ld\n", poly.size());
@@ -353,7 +353,7 @@ void tgPolygonFindSlivers( TGPolygon& in, poly_list& slivers )
 
 
 // output
-void TGPolygon::write_contour( const int contour, const string& file ) const {
+void TGPolygon::write_contour( const int contour, const std::string& file ) const {
     FILE *fp = fopen( file.c_str(), "w" );
     
     for ( int j = 0; j < (int)poly[contour].size(); ++j ) {
diff --git a/src/Prep/UserDef/tguserdef.cxx b/src/Prep/UserDef/tguserdef.cxx
index 28a690c8..e033e009 100644
--- a/src/Prep/UserDef/tguserdef.cxx
+++ b/src/Prep/UserDef/tguserdef.cxx
@@ -22,6 +22,7 @@
 using std::vector;
 using std::cerr;
 using std::endl;
+using std::string;
 
 static string prog_name;
 static string work_dir = ".";