David Rose 24 år sedan
förälder
incheckning
da58438429
1 ändrade filer med 6 tillägg och 1 borttagningar
  1. 6 1
      panda/src/pgui/pgMouseWatcherParameter.h

+ 6 - 1
panda/src/pgui/pgMouseWatcherParameter.h

@@ -32,7 +32,12 @@
 //               TypedReferenceCount so we can attach this thing to an
 //               TypedReferenceCount so we can attach this thing to an
 //               event.
 //               event.
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
-class EXPCL_PANDA PGMouseWatcherParameter : public MouseWatcherParameter, public TypedReferenceCount {
+class EXPCL_PANDA PGMouseWatcherParameter : public TypedReferenceCount, public MouseWatcherParameter {
+  // For now, this must inherit from TypedReferenceCount on the left,
+  // because MSVC++ wants to make that base class be the one at the
+  // front of the structure, not MouseWatcherParameter for some
+  // reason, and interrogate assumes that whichever base class is on
+  // the left will be at the front of the structure.
 public:
 public:
   INLINE PGMouseWatcherParameter();
   INLINE PGMouseWatcherParameter();
   INLINE PGMouseWatcherParameter(const MouseWatcherParameter &copy);
   INLINE PGMouseWatcherParameter(const MouseWatcherParameter &copy);