Browse Source

fix DO_PIPELINING break

David Rose 23 years ago
parent
commit
047508058e
2 changed files with 4 additions and 3 deletions
  1. 2 1
      panda/src/putil/pipelineCycler.I
  2. 2 2
      panda/src/putil/pipelineCyclerBase.I

+ 2 - 1
panda/src/putil/pipelineCycler.I

@@ -41,7 +41,8 @@ PipelineCycler(Pipeline *pipeline) :
 template<class CycleDataType>
 template<class CycleDataType>
 INLINE PipelineCycler<CycleDataType>::
 INLINE PipelineCycler<CycleDataType>::
 PipelineCycler(const PipelineCycler<CycleDataType> &copy) :
 PipelineCycler(const PipelineCycler<CycleDataType> &copy) :
-  PipelineCyclerBase(copy._data->make_copy(), copy)
+  // In the DO_PIPELINING copy constructor, the pointer value is ignored.
+  PipelineCyclerBase(NULL, copy)
 {
 {
 }
 }
 
 

+ 2 - 2
panda/src/putil/pipelineCyclerBase.I

@@ -44,8 +44,8 @@ PipelineCyclerBase(CycleData *initial_data, Pipeline *pipeline) :
 //  Description: 
 //  Description: 
 ////////////////////////////////////////////////////////////////////
 ////////////////////////////////////////////////////////////////////
 INLINE PipelineCyclerBase::
 INLINE PipelineCyclerBase::
-PipelineCyclerBase(CycleData *initial_data, const PipelineCyclerBase &copy) :
-  _data(initial_data),
+PipelineCyclerBase(CycleData *, const PipelineCyclerBase &copy) :
+  _data(copy._data->make_copy()),
   _pipeline(copy._pipeline),
   _pipeline(copy._pipeline),
   _read_count(0),
   _read_count(0),
   _write_count(0)
   _write_count(0)