// 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>
#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>
#include "ReaderWriterSTG.hxx"
#include "TileEntry.hxx"
-SG_USING_STD(string);
+using std::string;
using namespace simgear;
ModelLoadHelper *TileEntry::_modelLoader=0;
if (node)
geometry->addChild(node);
- return node;
+ return node != 0;
}
// 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;