FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make the weak pointer work. Some bits were left when importing.

Browse Source 
Modified Files:
	SGSharedPtr.hxx SGWeakPtr.hxx
This commit is contained in:
frohlich
2009-09-17 12:18:07 +02:00
committed by Tim Moore
parent 0f7b65a921
commit 7e2dafdcb8
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/structure/SGSharedPtr.hxx
+2
View File
@@ -98,6 +98,8 @@ public:
private: private:
void assign(T* p) void assign(T* p)
{ get(p); put(); _ptr = p; } { get(p); put(); _ptr = p; }
void assignNonRef(T* p)
{ put(); _ptr = p; }
void get(const T* p) const void get(const T* p) const
{ T::get(p); } { T::get(p); }
simgear/structure/SGWeakPtr.hxx
+2
View File
@@ -27,6 +27,8 @@ public:
{ } { }
SGWeakPtr(const SGWeakPtr& p) : mWeakData(p.mWeakData) SGWeakPtr(const SGWeakPtr& p) : mWeakData(p.mWeakData)
{ } { }
SGWeakPtr(T* ptr)
{ assign(ptr); }
template<typename U> template<typename U>
SGWeakPtr(const SGSharedPtr<U>& p) SGWeakPtr(const SGSharedPtr<U>& p)
{ SGSharedPtr<T> sharedPtr = p; assign(sharedPtr.get()); } { SGSharedPtr<T> sharedPtr = p; assign(sharedPtr.get()); }