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

EXPCL_PANDAEXPRESS, win32 fixes

Browse Source
This commit is contained in:
David Rose 2004-09-30 21:46:03 +00:00
parent 683c6615fb
commit 9f96811a21
4 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
panda/src/express/memoryUsage.cxx
View File

@ -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
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

2
panda/src/express/pointerToArray.I
View File

@ -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;
} }
//////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////

2
panda/src/express/pointerToVoid.h
View File

@ -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();

2
panda/src/express/weakPointerToVoid.h
View File

@ -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();