Compile even if OSG_USE_REF_PTR_IMPLICIT_OUTPUT_CONVERSION is not set.

[simgear.git] / simgear / scene / model / modellib.hxx

diff --git a/simgear/scene/model/modellib.hxx b/simgear/scene/model/modellib.hxx
index 806b7f23b51328ccf84702fe1ad9f89d63687543..7c38b10abedd6adcfcf659d601a7b5b1452145db 100644 (file)
--- a/simgear/scene/model/modellib.hxx
+++ b/simgear/scene/model/modellib.hxx
@@ -30,8 +30,8 @@
 
 #include <simgear/props/props.hxx>
 
-SG_USING_STD(map);
-SG_USING_STD(string);
+using std::map;
+using std::string;
 
 namespace simgear {
 
@@ -83,16 +83,8 @@ protected:
 class SGModelData : public osg::Referenced {
 public:
     virtual ~SGModelData() {}
-    virtual void modelLoaded( const string& path, SGPropertyNode *prop,
-                              osg::Node*branch) = 0;
-
-    virtual void setProps(SGPropertyNode *p)
-        { _props = p; }
-
-    SGPropertyNode *getProperties()
-        { return _props; }
-protected:
-    SGPropertyNode_ptr _props;
+    virtual void modelLoaded(const string& path, SGPropertyNode *prop,
+                             osg::Node* branch) = 0;
 };
 
 }