diff options
| author | kwolekr <kwolekr@minetest.net> | 2015-04-21 18:12:01 -0400 |
|---|---|---|
| committer | kwolekr <kwolekr@minetest.net> | 2015-04-21 18:12:01 -0400 |
| commit | e0eec201a18a0741114094b600f765313a838bfb (patch) | |
| tree | 1d0b163530902939b61902d393032a07482087ef /src/environment.h | |
| parent | 972d17baea81ffe6d508b291ef97207a4822e1da (diff) | |
| download | minetest-e0eec201a18a0741114094b600f765313a838bfb.tar.gz minetest-e0eec201a18a0741114094b600f765313a838bfb.tar.bz2 minetest-e0eec201a18a0741114094b600f765313a838bfb.zip | |
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.
Diffstat (limited to 'src/environment.h')
| -rw-r--r-- | src/environment.h | 3 |
1 files changed, 1 insertions, 2 deletions
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 <set> #include <list> #include <map> -#include <queue> #include "irr_v3d.h" #include "activeobject.h" #include "util/numeric.h" @@ -379,7 +378,7 @@ private: // Active object list std::map<u16, ServerActiveObject*> m_active_objects; // Outgoing network message buffer for active objects - std::queue<ActiveObjectMessage> m_active_object_messages_queue; + std::list<ActiveObjectMessage> m_active_object_messages; // Some timers float m_send_recommended_timer; IntervalLimiter m_object_management_interval; |