diff --git a/MP2/MP2_Sources/cont_frame_pool.C b/MP2/MP2_Sources/cont_frame_pool.C index c735938..a0c4516 100644 --- a/MP2/MP2_Sources/cont_frame_pool.C +++ b/MP2/MP2_Sources/cont_frame_pool.C @@ -127,7 +127,7 @@ /* METHODS FOR CLASS C o n t F r a m e P o o l */ /*--------------------------------------------------------------------------*/ -std::vector ContFramePool::pools; // List of frame pools, managed by the class +ContFramePool* ContFramePool::pools = (ContFramePool *) FRAME_SIZE; // List of frame pools, managed by the class unsigned int ContFramePool::nPools = 0; // Number of pools being managed ContFramePool::ContFramePool(unsigned long _base_frame_no, @@ -149,7 +149,7 @@ ContFramePool::ContFramePool(unsigned long _base_frame_no, info_frame_no = _info_frame_no; n_info_frames = _n_info_frames; - pools.push_back(*this); + pools[nPools] = *this; nPools += 1; // If _info_frame_no is zero then we keep management info in the first diff --git a/MP2/MP2_Sources/cont_frame_pool.H b/MP2/MP2_Sources/cont_frame_pool.H index b89a476..13c7a07 100755 --- a/MP2/MP2_Sources/cont_frame_pool.H +++ b/MP2/MP2_Sources/cont_frame_pool.H @@ -27,7 +27,6 @@ /*--------------------------------------------------------------------------*/ #include "machine.H" -#include /*--------------------------------------------------------------------------*/ /* DATA STRUCTURES */ @@ -50,7 +49,7 @@ private: unsigned long nframes; // Size of the frame pool unsigned long info_frame_no; // Where do we store the management information? unsigned long n_info_frames; // Number of frames needed to store management info - static std::vector pools; // List of frame pools, managed by the class + static ContFramePool* pools; // List of frame pools, managed by the class static unsigned int nPools; // Number of pools being managed void mark_inaccessible(unsigned long _frame_no); // Should be a frame marked as