diff --git a/VCellMessaging/include/VCELL/SimulationMessaging.h b/VCellMessaging/include/VCELL/SimulationMessaging.h index 20979cce..3180e211 100644 --- a/VCellMessaging/include/VCELL/SimulationMessaging.h +++ b/VCellMessaging/include/VCELL/SimulationMessaging.h @@ -1,7 +1,7 @@ #ifndef _SIMULATIONMESSAGING_H_ #define _SIMULATIONMESSAGING_H_ -#include +#include #ifdef USE_MESSAGING #include #include @@ -145,7 +145,7 @@ class SimulationMessaging private: SimulationMessaging(); static SimulationMessaging *m_inst; - std::deque events; + std::vector events; int workerEventOutputMode; void sendStatus(); diff --git a/VCellMessaging/src/SimulationMessaging.cpp b/VCellMessaging/src/SimulationMessaging.cpp index 4747cb85..5537ff49 100644 --- a/VCellMessaging/src/SimulationMessaging.cpp +++ b/VCellMessaging/src/SimulationMessaging.cpp @@ -155,7 +155,10 @@ void SimulationMessaging::sendStatus() { WorkerEventLocker locker(*this); if (events.size( ) > 0 ) { workerEvent = events.front( ); - events.pop_front( ); + if (!events.empty()) + { + events.erase(events.begin()); + } } else { return;