SGSharedPtr: add constructor to convert from SGWeakPtr.

diff --git a/simgear/structure/SGSharedPtr.hxx b/simgear/structure/SGSharedPtr.hxx
index 87497b8e0bfde5ec02d0bc12c3b2697769837cdf..9e92a7b0f396530e7496e18ea59f1e44b98315bb 100644 (file)
--- a/simgear/structure/SGSharedPtr.hxx
+++ b/simgear/structure/SGSharedPtr.hxx
@@ -60,6 +60,9 @@ public:
   template<typename U>
   SGSharedPtr(const SGSharedPtr<U>& p) : _ptr(p.get())
   { get(_ptr); }
+  template<typename U>
+  explicit SGSharedPtr(const SGWeakPtr<U>& p): _ptr(0)
+  { reset(p.lock().get()); }
   ~SGSharedPtr(void)
   { reset(); }
   

diff --git a/simgear/structure/shared_ptr_test.cpp b/simgear/structure/shared_ptr_test.cpp
index d7b7364155f01447b29ca26ee5edc7269b353803..877e1468e2b6aceec8717f8c7b3f6f61c50b5168 100644 (file)
--- a/simgear/structure/shared_ptr_test.cpp
+++ b/simgear/structure/shared_ptr_test.cpp
@@ -72,6 +72,9 @@ BOOST_AUTO_TEST_CASE( virtual_weak_ptr )
   SGSharedPtr<Base1> ptr1( weak_ptr.lock() );
   BOOST_REQUIRE_EQUAL( ptr.getNumRefs(), 2 );
 
+  // converting constructor
+  BOOST_REQUIRE_EQUAL( SGSharedPtr<Base1>(weak_ptr), ptr1 );
+
   SGSharedPtr<Base2> ptr2( weak_ptr.lock() );
   BOOST_REQUIRE_EQUAL( ptr.getNumRefs(), 3 );