Merge branch 'maint' into next

[simgear.git] / simgear / scene / tgdb / obj.hxx

diff --git a/simgear/scene/tgdb/obj.hxx b/simgear/scene/tgdb/obj.hxx
index f0c3130092bbeb481f098501ba0c74df1e09391d..126ed6ccab3645d05fe7afe7f38accb8f4039cef 100644 (file)
--- a/simgear/scene/tgdb/obj.hxx
+++ b/simgear/scene/tgdb/obj.hxx
@@ -31,14 +31,14 @@
 
 #include <simgear/compiler.h>
 
-#include STL_STRING
+#include <string>
 
 #include <osg/Node>
 #include <osg/Group>
 
 #include "SGOceanTile.hxx"
 
-SG_USING_STD(string);
+using std::string;
 
 class SGBucket;
 class SGMaterialLib;
@@ -56,6 +56,6 @@ inline bool SGGenTile( const std::string&, const SGBucket& b,
 }
 
 osg::Node*
-SGLoadBTG(const std::string& path, SGMaterialLib *matlib, bool calc_lights, bool use_random_objects);
+SGLoadBTG(const std::string& path, SGMaterialLib *matlib, bool calc_lights, bool use_random_objects, bool use_random_vegetation);
 
 #endif // _SG_OBJ_HXX