From e0eec201a18a0741114094b600f765313a838bfb Mon Sep 17 00:00:00 2001 From: kwolekr Date: Tue, 21 Apr 2015 18:12:01 -0400 Subject: Revert "m_active_object_messages is used like a queue. Use std::queue instead of std::list. Also rename to m_active_object_messages_queue" This reverts commit 972d17baea81ffe6d508b291ef97207a4822e1da. The commit being reverted was unauthorized. There had been no discussion, review, or sign-off prior to submittal to upstream. --- src/environment.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'src/environment.h') diff --git a/src/environment.h b/src/environment.h index e0d8d4328..415a9ec31 100644 --- a/src/environment.h +++ b/src/environment.h @@ -33,7 +33,6 @@ with this program; if not, write to the Free Software Foundation, Inc., #include #include #include -#include #include "irr_v3d.h" #include "activeobject.h" #include "util/numeric.h" @@ -379,7 +378,7 @@ private: // Active object list std::map m_active_objects; // Outgoing network message buffer for active objects - std::queue m_active_object_messages_queue; + std::list m_active_object_messages; // Some timers float m_send_recommended_timer; IntervalLimiter m_object_management_interval; -- cgit v1.2.3