TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-09-28 07:48:37 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'release/1.10.x'

Browse Source
This commit is contained in:
rdb 2020-05-05 18:15:57 +02:00
commit 36c3d3e622
4 changed files with 19 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
direct/src/dcparser/dcPacker.I
View File

@ -1124,7 +1124,9 @@ operator new(size_t size) {
*/ */
INLINE void DCPacker::StackElement:: INLINE void DCPacker::StackElement::
operator delete(void *ptr) { operator delete(void *ptr) {
StackElement *obj = (StackElement *)ptr; if (ptr != nullptr) {
obj->_next = _deleted_chain; StackElement *obj = (StackElement *)ptr;
_deleted_chain = obj; obj->_next = _deleted_chain;
_deleted_chain = obj;
}
} }

4
direct/src/distributed/ServerRepository.py
View File

@ -628,7 +628,7 @@ class ServerRepository:
del self.clientsByConnection[client.connection] del self.clientsByConnection[client.connection]
del self.clientsByDoIdBase[client.doIdBase] del self.clientsByDoIdBase[client.doIdBase]
id = client.doIdBase / self.doIdRange id = client.doIdBase // self.doIdRange
self.idAllocator.free(id) self.idAllocator.free(id)
self.qcr.removeConnection(client.connection) self.qcr.removeConnection(client.connection)
@ -689,7 +689,7 @@ class ServerRepository:
def clientHardDisconnectTask(self, task): def clientHardDisconnectTask(self, task):
""" client did not tell us he was leaving but we lost connection to """ client did not tell us he was leaving but we lost connection to
him, so we need to update our data and tell others """ him, so we need to update our data and tell others """
for client in self.clientsByConnection.values(): for client in list(self.clientsByConnection.values()):
if not self.qcr.isConnectionOk(client.connection): if not self.qcr.isConnectionOk(client.connection):
self.handleClientDisconnect(client) self.handleClientDisconnect(client)
return Task.cont return Task.cont

8
dtool/src/dtoolbase/deletedChain.h
View File

@ -85,7 +85,9 @@ public:
return ptr; \ return ptr; \
} \ } \
inline void operator delete(void *ptr) { \ inline void operator delete(void *ptr) { \
StaticDeletedChain< Type >::deallocate((Type *)ptr, get_type_handle(Type)); \ if (ptr != nullptr) { \
StaticDeletedChain< Type >::deallocate((Type *)ptr, get_type_handle(Type)); \
} \
} \ } \
inline void operator delete(void *, void *) { \ inline void operator delete(void *, void *) { \
} \ } \
@ -104,7 +106,9 @@ public:
return ptr; \ return ptr; \
} \ } \
inline void operator delete(void *ptr) { \ inline void operator delete(void *ptr) { \
_deleted_chain.deallocate((Type *)ptr, get_type_handle(Type)); \ if (ptr != nullptr) { \
_deleted_chain.deallocate((Type *)ptr, get_type_handle(Type)); \
} \
} \ } \
inline void operator delete(void *, void *) { \ inline void operator delete(void *, void *) { \
} \ } \

8
dtool/src/dtoolbase/memoryBase.h
View File

@ -32,7 +32,9 @@
return ptr; \ return ptr; \
} \ } \
inline void operator delete(void *ptr) { \ inline void operator delete(void *ptr) { \
PANDA_FREE_SINGLE(ptr); \ if (ptr != nullptr) { \
PANDA_FREE_SINGLE(ptr); \
} \
} \ } \
inline void operator delete(void *, void *) { \ inline void operator delete(void *, void *) { \
} \ } \
@ -44,7 +46,9 @@
return ptr; \ return ptr; \
} \ } \
inline void operator delete[](void *ptr) { \ inline void operator delete[](void *ptr) { \
PANDA_FREE_ARRAY(ptr); \ if (ptr != nullptr) { \
PANDA_FREE_ARRAY(ptr); \
} \
} \ } \
inline void operator delete[](void *, void *) { \ inline void operator delete[](void *, void *) { \
} }