Add shared_array to vc8 solution.

Fix shared_xxx::operator=.

git-svn-id: https://assimp.svn.sourceforge.net/svnroot/assimp/trunk@669 67173fc5-114c-0410-ac8e-9d2fd5bffc1f
pull/1/head
aramis_acg 2010-04-11 02:52:27 +00:00
parent 630005619b
commit 4f50c04347
3 changed files with 9 additions and 2 deletions

View File

@ -114,11 +114,13 @@ public:
shared_array& operator= (const shared_array& r) { shared_array& operator= (const shared_array& r) {
if(r == *this) { if(r == *this) {
return; return *this;
} }
ctr->decref(ptr); ctr->decref(ptr);
ctr = r.ctr->incref(); ctr = r.ctr->incref();
ptr = r.ptr; ptr = r.ptr;
return *this;
} }
// automatic destruction of the wrapped object when all // automatic destruction of the wrapped object when all

View File

@ -114,11 +114,12 @@ public:
shared_ptr& operator= (const shared_ptr& r) { shared_ptr& operator= (const shared_ptr& r) {
if(r == *this) { if(r == *this) {
return; return *this;
} }
ctr->decref(ptr); ctr->decref(ptr);
ctr = r.ctr->incref(); ctr = r.ctr->incref();
ptr = r.ptr; ptr = r.ptr;
return *this;
} }
// automatic destruction of the wrapped object when all // automatic destruction of the wrapped object when all

View File

@ -3684,6 +3684,10 @@
RelativePath="..\..\code\BoostWorkaround\boost\scoped_ptr.hpp" RelativePath="..\..\code\BoostWorkaround\boost\scoped_ptr.hpp"
> >
</File> </File>
<File
RelativePath="..\..\code\BoostWorkaround\boost\shared_array.hpp"
>
</File>
<File <File
RelativePath="..\..\code\BoostWorkaround\boost\shared_ptr.hpp" RelativePath="..\..\code\BoostWorkaround\boost\shared_ptr.hpp"
> >