mirror of
https://github.com/panda3d/panda3d.git
synced 2025-10-03 10:22:45 -04:00
EXPCL_PANDAEXPRESS, win32 fixes
This commit is contained in:
parent
683c6615fb
commit
9f96811a21
@ -749,7 +749,13 @@ ns_get_interpreter_size() {
|
|||||||
////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////
|
||||||
size_t MemoryUsage::
|
size_t MemoryUsage::
|
||||||
ns_get_total_size() {
|
ns_get_total_size() {
|
||||||
|
#if defined(WIN32_VC) && defined(_DEBUG)
|
||||||
return _total_size;
|
return _total_size;
|
||||||
|
#else
|
||||||
|
// If we aren't tracking _total_size, report _cpp_size as the next
|
||||||
|
// best thing.
|
||||||
|
return _cpp_size;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////
|
||||||
|
@ -752,7 +752,7 @@ v() const {
|
|||||||
nassertd(_void_ptr != NULL) {
|
nassertd(_void_ptr != NULL) {
|
||||||
((ConstPointerToArray<Element> *)this)->reassign(new RefCountObj<pvector<Element> >);
|
((ConstPointerToArray<Element> *)this)->reassign(new RefCountObj<pvector<Element> >);
|
||||||
}
|
}
|
||||||
return *_ptr;
|
return *(To *)_void_ptr;
|
||||||
}
|
}
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////
|
||||||
|
@ -33,7 +33,7 @@
|
|||||||
//
|
//
|
||||||
// This is the base class for PointerToBase<T>.
|
// This is the base class for PointerToBase<T>.
|
||||||
////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////
|
||||||
class PointerToVoid {
|
class EXPCL_PANDAEXPRESS PointerToVoid {
|
||||||
protected:
|
protected:
|
||||||
INLINE PointerToVoid();
|
INLINE PointerToVoid();
|
||||||
INLINE ~PointerToVoid();
|
INLINE ~PointerToVoid();
|
||||||
|
@ -28,7 +28,7 @@
|
|||||||
// pointers. It needs an additional flag to indicate
|
// pointers. It needs an additional flag to indicate
|
||||||
// that the pointer has been deleted.
|
// that the pointer has been deleted.
|
||||||
////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////
|
||||||
class WeakPointerToVoid : public PointerToVoid {
|
class EXPCL_PANDAEXPRESS WeakPointerToVoid : public PointerToVoid {
|
||||||
protected:
|
protected:
|
||||||
INLINE WeakPointerToVoid();
|
INLINE WeakPointerToVoid();
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user