Browse Source

Ensure classes using aligned types inherit from `MemoryBase`

WMOkiishi 2 years ago
parent
commit
3f3c65917b

+ 2 - 1
panda/src/grutil/lineSegs.h

@@ -17,6 +17,7 @@
 #include "pandabase.h"
 #include "pandabase.h"
 
 
 #include "luse.h"
 #include "luse.h"
+#include "memoryBase.h"
 #include "geom.h"
 #include "geom.h"
 #include "geomNode.h"
 #include "geomNode.h"
 #include "geomVertexData.h"
 #include "geomVertexData.h"
@@ -65,7 +66,7 @@ PUBLISHED:
   INLINE void set_vertex_color(int vertex, PN_stdfloat r, PN_stdfloat g, PN_stdfloat b, PN_stdfloat a = 1.0f);
   INLINE void set_vertex_color(int vertex, PN_stdfloat r, PN_stdfloat g, PN_stdfloat b, PN_stdfloat a = 1.0f);
 
 
 private:
 private:
-  class Point {
+  class Point : public MemoryBase {
   public:
   public:
     INLINE Point();
     INLINE Point();
     INLINE Point(const LVecBase3 &point, const LColor &color);
     INLINE Point(const LVecBase3 &point, const LColor &color);

+ 2 - 1
panda/src/parametrics/ropeNode.h

@@ -15,6 +15,7 @@
 #define ROPENODE_H
 #define ROPENODE_H
 
 
 #include "pandabase.h"
 #include "pandabase.h"
+#include "memoryBase.h"
 #include "nurbsCurveEvaluator.h"
 #include "nurbsCurveEvaluator.h"
 #include "pandaNode.h"
 #include "pandaNode.h"
 #include "pStatCollector.h"
 #include "pStatCollector.h"
@@ -173,7 +174,7 @@ private:
   void render_tube(CullTraverser *trav, CullTraverserData &data,
   void render_tube(CullTraverser *trav, CullTraverserData &data,
                    NurbsCurveResult *result) const;
                    NurbsCurveResult *result) const;
 
 
-  class CurveVertex {
+  class CurveVertex : public MemoryBase {
   public:
   public:
     LPoint3 _p;
     LPoint3 _p;
     UnalignedLVecBase4 _c;
     UnalignedLVecBase4 _c;

+ 2 - 1
panda/src/pgraph/portalClipper.h

@@ -24,6 +24,7 @@
 #include "transformState.h"
 #include "transformState.h"
 #include "geometricBoundingVolume.h"
 #include "geometricBoundingVolume.h"
 #include "boundingHexahedron.h"
 #include "boundingHexahedron.h"
+#include "memoryBase.h"
 #include "pointerTo.h"
 #include "pointerTo.h"
 #include "drawMask.h"
 #include "drawMask.h"
 #include "typedObject.h"
 #include "typedObject.h"
@@ -94,7 +95,7 @@ private:
   static TypeHandle _type_handle;
   static TypeHandle _type_handle;
 
 
 private:
 private:
-  class Point {
+  class Point : public MemoryBase {
   public:
   public:
     INLINE Point();
     INLINE Point();
     INLINE Point(const LVecBase3 &point, const LColor &color);
     INLINE Point(const LVecBase3 &point, const LColor &color);

+ 2 - 1
panda/src/pgraphnodes/lodNode.h

@@ -18,6 +18,7 @@
 #include "config_pgraphnodes.h"
 #include "config_pgraphnodes.h"
 #include "pandaNode.h"
 #include "pandaNode.h"
 #include "luse.h"
 #include "luse.h"
+#include "memoryBase.h"
 #include "pvector.h"
 #include "pvector.h"
 
 
 /**
 /**
@@ -115,7 +116,7 @@ private:
   static const LColor &get_default_show_color(int index);
   static const LColor &get_default_show_color(int index);
 
 
 protected:
 protected:
-  class Switch {
+  class Switch : public MemoryBase {
   public:
   public:
     INLINE Switch(PN_stdfloat in, PN_stdfloat out);
     INLINE Switch(PN_stdfloat in, PN_stdfloat out);
     INLINE PN_stdfloat get_in() const;
     INLINE PN_stdfloat get_in() const;

+ 2 - 1
panda/src/pgui/pgFrameStyle.h

@@ -17,6 +17,7 @@
 #include "pandabase.h"
 #include "pandabase.h"
 
 
 #include "luse.h"
 #include "luse.h"
+#include "memoryBase.h"
 #include "texture.h"
 #include "texture.h"
 #include "pointerTo.h"
 #include "pointerTo.h"
 
 
@@ -26,7 +27,7 @@ class NodePath;
 /**
 /**
  *
  *
  */
  */
-class EXPCL_PANDA_PGUI PGFrameStyle {
+class EXPCL_PANDA_PGUI PGFrameStyle : public MemoryBase {
 PUBLISHED:
 PUBLISHED:
   INLINE PGFrameStyle();
   INLINE PGFrameStyle();
   INLINE PGFrameStyle(const PGFrameStyle &copy);
   INLINE PGFrameStyle(const PGFrameStyle &copy);