Merge branch 'master' of git://gitorious.org/fg/simgear into fredb/winbuild

[simgear.git] / simgear / structure / SGSharedPtr.hxx

diff --git a/simgear/structure/SGSharedPtr.hxx b/simgear/structure/SGSharedPtr.hxx
index b99a6a8f7f95bd64f993de5be65be825e0e1ba50..f321b12dc4a3e4578b14276d2e5f74dfded32b2c 100644 (file)
--- a/simgear/structure/SGSharedPtr.hxx
+++ b/simgear/structure/SGSharedPtr.hxx
@@ -98,6 +98,8 @@ public:
 private:
   void assign(T* p)
   { get(p); put(); _ptr = p; }
+  void assignNonRef(T* p)
+  { put(); _ptr = p; }
 
   void get(const T* p) const
   { T::get(p); }
@@ -111,4 +113,12 @@ private:
   friend class SGWeakPtr;
 };
 
+/**
+ * Support for boost::mem_fn
+ */
+template<typename T>
+T* get_pointer(SGSharedPtr<T> const & p)
+{
+  return p.ptr();
+}
 #endif