TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 19:08:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.9.x'

Browse Source
This commit is contained in:
rdb 2015-07-17 15:56:15 +02:00
commit 4df64f7b42
2 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
panda/src/express/pointerToBase.I
View File

@ -71,6 +71,8 @@ PointerToBase(PointerToBase<T> &&from) NOEXCEPT {
template<class T> template<class T>
INLINE void PointerToBase<T>:: INLINE void PointerToBase<T>::
reassign(PointerToBase<T> &&from) NOEXCEPT { reassign(PointerToBase<T> &&from) NOEXCEPT {
// Protect against self-move-assignment.
if (from._void_ptr != this->_void_ptr) {
To *old_ptr = (To *)this->_void_ptr; To *old_ptr = (To *)this->_void_ptr;
this->_void_ptr = from._void_ptr; this->_void_ptr = from._void_ptr;
@ -81,6 +83,7 @@ reassign(PointerToBase<T> &&from) NOEXCEPT {
unref_delete(old_ptr); unref_delete(old_ptr);
} }
} }
}
#endif // USE_MOVE_SEMANTICS #endif // USE_MOVE_SEMANTICS
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

3
panda/src/putil/copyOnWritePointer.I
View File

@ -102,6 +102,8 @@ CopyOnWritePointer(CopyOnWritePointer &&move) NOEXCEPT :
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////
INLINE void CopyOnWritePointer:: INLINE void CopyOnWritePointer::
operator = (CopyOnWritePointer &&move) NOEXCEPT { operator = (CopyOnWritePointer &&move) NOEXCEPT {
// Protect against self-move-assignment.
if (move._cow_object != _cow_object) {
CopyOnWriteObject *old_object = _cow_object; CopyOnWriteObject *old_object = _cow_object;
_cow_object = move._cow_object; _cow_object = move._cow_object;
move._cow_object = NULL; move._cow_object = NULL;
@ -110,6 +112,7 @@ operator = (CopyOnWritePointer &&move) NOEXCEPT {
cache_unref_delete(old_object); cache_unref_delete(old_object);
} }
} }
}
#endif // USE_MOVE_SEMANTICS #endif // USE_MOVE_SEMANTICS
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////