From 63484c83cbd667949ef8af03a53e84479b76b100 Mon Sep 17 00:00:00 2001 From: rdb Date: Wed, 31 Oct 2018 21:25:03 +0100 Subject: [PATCH] pipeline: CycleData should always inherit from MemoryBase We need to guarantee that CData classes are aligned properly, even if DO_PIPELINING is not enabled. --- panda/src/pipeline/cycleData.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/panda/src/pipeline/cycleData.h b/panda/src/pipeline/cycleData.h index ef21ad7a33..c2bcef4073 100644 --- a/panda/src/pipeline/cycleData.h +++ b/panda/src/pipeline/cycleData.h @@ -44,7 +44,7 @@ class EXPCL_PANDA_PIPELINE CycleData : public NodeReferenceCount // If we are *not* compiling in pipelining support, the CycleData object is // stored directly within its containing classes, and hence should not be a // ReferenceCount object. -class EXPCL_PANDA_PIPELINE CycleData +class EXPCL_PANDA_PIPELINE CycleData : public MemoryBase #endif // DO_PIPELINING {