diff --git a/code/BoostWorkaround/boost/shared_array.hpp b/code/BoostWorkaround/boost/shared_array.hpp index 98f62edee..eb6501565 100644 --- a/code/BoostWorkaround/boost/shared_array.hpp +++ b/code/BoostWorkaround/boost/shared_array.hpp @@ -114,11 +114,13 @@ public: shared_array& operator= (const shared_array& r) { if(r == *this) { - return; + return *this; } ctr->decref(ptr); ctr = r.ctr->incref(); ptr = r.ptr; + + return *this; } // automatic destruction of the wrapped object when all diff --git a/code/BoostWorkaround/boost/shared_ptr.hpp b/code/BoostWorkaround/boost/shared_ptr.hpp index 7876948d6..6069ca101 100644 --- a/code/BoostWorkaround/boost/shared_ptr.hpp +++ b/code/BoostWorkaround/boost/shared_ptr.hpp @@ -114,11 +114,12 @@ public: shared_ptr& operator= (const shared_ptr& r) { if(r == *this) { - return; + return *this; } ctr->decref(ptr); ctr = r.ctr->incref(); ptr = r.ptr; + return *this; } // automatic destruction of the wrapped object when all diff --git a/workspaces/vc8/assimp.vcproj b/workspaces/vc8/assimp.vcproj index 08ca4cd74..f5b6d523e 100644 --- a/workspaces/vc8/assimp.vcproj +++ b/workspaces/vc8/assimp.vcproj @@ -3684,6 +3684,10 @@ RelativePath="..\..\code\BoostWorkaround\boost\scoped_ptr.hpp" > + +