Merge branch 'maint' into next

[simgear.git] / simgear / scene / tgdb / TileEntry.cxx

diff --git a/simgear/scene/tgdb/TileEntry.cxx b/simgear/scene/tgdb/TileEntry.cxx
index 2eb63a110927201a6210d50d491e15196726e1c0..3442d39f55165b376476b07e8e9b7dde7fa45912 100644 (file)
--- a/simgear/scene/tgdb/TileEntry.cxx
+++ b/simgear/scene/tgdb/TileEntry.cxx
@@ -25,7 +25,7 @@
 #include <simgear/compiler.h>
 #include <plib/ul.h>
 
-#include STL_STRING
+#include <string>
 #include <sstream>
 #include <istream>
 
@@ -45,7 +45,6 @@
 
 #include <simgear/bucket/newbucket.hxx>
 #include <simgear/debug/logstream.hxx>
-#include <simgear/math/polar3d.hxx>
 #include <simgear/math/sg_geodesy.hxx>
 #include <simgear/math/sg_random.h>
 #include <simgear/math/SGMath.hxx>
@@ -62,7 +61,7 @@
 #include "ReaderWriterSTG.hxx"
 #include "TileEntry.hxx"
 
-SG_USING_STD(string);
+using std::string;
 using namespace simgear;
 
 ModelLoadHelper *TileEntry::_modelLoader=0;