Replace SG_USE_STD() by using std::

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

diff --git a/simgear/scene/tgdb/TileEntry.cxx b/simgear/scene/tgdb/TileEntry.cxx
index 2782c023b3f97f33043c5fd5be301b9bf0040548..64f9c3e0cb6021ecbc06b994d4d9b910f3b0b783 100644 (file)
--- a/simgear/scene/tgdb/TileEntry.cxx
+++ b/simgear/scene/tgdb/TileEntry.cxx
@@ -25,8 +25,9 @@
 #include <simgear/compiler.h>
 #include <plib/ul.h>
 
-#include STL_STRING
+#include <string>
 #include <sstream>
+#include <istream>
 
 #include <osg/Array>
 #include <osg/Geometry>
@@ -61,7 +62,7 @@
 #include "ReaderWriterSTG.hxx"
 #include "TileEntry.hxx"
 
-SG_USING_STD(string);
+using std::string;
 using namespace simgear;
 
 ModelLoadHelper *TileEntry::_modelLoader=0;
@@ -237,7 +238,7 @@ bool TileEntry::obj_load( const string& path,
     if (node)
       geometry->addChild(node);
 
-    return node;
+    return node != 0;
 }
 
 
@@ -252,7 +253,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;