cleanup

Add support for boost::mem_fn to SGSharedPtr.

Remove a couple of "using" declarations from scene/model/model.hxx

diff --git a/simgear/scene/model/model.hxx b/simgear/scene/model/model.hxx
index 9f930f3eb8d2b83010c50c4093db58a079b66112..bef5a32246d65f9d8691f7eef05da70f91a89d0a 100644 (file)
--- a/simgear/scene/model/model.hxx
+++ b/simgear/scene/model/model.hxx
@@ -15,9 +15,6 @@
 #include <vector>
 #include <set>
 
-using std::vector;
-using std::set;
-
 #include <osg/Node>
 #include <osg/Texture2D>
 #include <osgDB/ReaderWriter>

diff --git a/simgear/structure/SGSharedPtr.hxx b/simgear/structure/SGSharedPtr.hxx
index b99a6a8f7f95bd64f993de5be65be825e0e1ba50..cbaee0f6c3fcc3d5e75fbe052eed5a148efbf84a 100644 (file)
--- a/simgear/structure/SGSharedPtr.hxx
+++ b/simgear/structure/SGSharedPtr.hxx
@@ -111,4 +111,12 @@ private:
   friend class SGWeakPtr;
 };
 
+/**
+ * Support for boost::mem_fn
+ */
+template<typename T>
+T* get_pointer(SGSharedPtr<T> const & p)
+{
+  return p.ptr();
+}
 #endif