EXPCL_PANDAEXPRESS, win32 fixes

panda/src/express/memoryUsage.cxx

@@ -749,7 +749,13 @@ ns_get_interpreter_size() {
 ////////////////////////////////////////////////////////////////////
 size_t MemoryUsage::
 ns_get_total_size() {
+#if defined(WIN32_VC) && defined(_DEBUG)
   return _total_size;
+#else
+  // If we aren't tracking _total_size, report _cpp_size as the next
+  // best thing.
+  return _cpp_size;
+#endif
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/express/pointerToArray.I

@@ -752,7 +752,7 @@ v() const {
   nassertd(_void_ptr != NULL) {
     ((ConstPointerToArray<Element> *)this)->reassign(new RefCountObj<pvector<Element> >);
   }
-  return *_ptr;
+  return *(To *)_void_ptr;
 }
 
 ////////////////////////////////////////////////////////////////////

panda/src/express/pointerToVoid.h

@@ -33,7 +33,7 @@
 //
 //               This is the base class for PointerToBase<T>.
 ////////////////////////////////////////////////////////////////////
-class PointerToVoid {
+class EXPCL_PANDAEXPRESS PointerToVoid {
 protected:
   INLINE PointerToVoid();
   INLINE ~PointerToVoid();

panda/src/express/weakPointerToVoid.h

@@ -28,7 +28,7 @@
 //               pointers.  It needs an additional flag to indicate
 //               that the pointer has been deleted.
 ////////////////////////////////////////////////////////////////////
-class WeakPointerToVoid : public PointerToVoid {
+class EXPCL_PANDAEXPRESS WeakPointerToVoid : public PointerToVoid {
 protected:
   INLINE WeakPointerToVoid();