X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=simgear%2Fscene%2Ftgdb%2FTileEntry.cxx;h=3442d39f55165b376476b07e8e9b7dde7fa45912;hb=7e7ce2f38e87d6244e05730fa4382da088bb25f1;hp=0b4ebfadb3ad13f5c2d4b99f5510d39ca53f872b;hpb=367f1813dea1e24d6f7e7eb3ecbcfa87cb98a5d1;p=simgear.git

diff --git a/simgear/scene/tgdb/TileEntry.cxx b/simgear/scene/tgdb/TileEntry.cxx
index 0b4ebfad..3442d39f 100644
--- a/simgear/scene/tgdb/TileEntry.cxx
+++ b/simgear/scene/tgdb/TileEntry.cxx
@@ -18,11 +18,16 @@
 // along with this program; if not, write to the Free Software
 // Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include <simgear/compiler.h>
 #include <plib/ul.h>
 
-#include STL_STRING
+#include <string>
 #include <sstream>
+#include <istream>
 
 #include <osg/Array>
 #include <osg/Geometry>
@@ -40,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>
@@ -57,7 +61,7 @@
 #include "ReaderWriterSTG.hxx"
 #include "TileEntry.hxx"
 
-SG_USING_STD(string);
+using std::string;
 using namespace simgear;
 
 ModelLoadHelper *TileEntry::_modelLoader=0;
@@ -233,7 +237,7 @@ bool TileEntry::obj_load( const string& path,
     if (node)
       geometry->addChild(node);
 
-    return node;
+    return node != 0;
 }
 
 
@@ -248,7 +252,8 @@ typedef enum {
 
 // storage class for deferred object processing in TileEntry::load()
 struct Object {
-    Object(object_type t, const string& token, const SGPath& p, istream& in)
+    Object(object_type t, const string& token, const SGPath& p,
+           std::istream& in)
         : type(t), path(p)
     {
         in >> name;