diff options
author | DDuarte <dnpd.dd@gmail.com> | 2014-07-27 17:33:42 +0100 |
---|---|---|
committer | DDuarte <dnpd.dd@gmail.com> | 2014-07-27 17:33:42 +0100 |
commit | eabf0f44dd4d3514dd302cd7608fbcaa8e3fa776 (patch) | |
tree | 2714e1127856faf29e9a788d1a1f36e528804f94 | |
parent | 6f272ea5b7d6551844aa1a1f748cee5c79b746f3 (diff) |
Tools/mmaps: Change the PCQ queue to uint32 again
6f272ea5b7d65518 re-added support for non-pointer types
-rw-r--r-- | src/tools/mmaps_generator/MapBuilder.cpp | 11 | ||||
-rw-r--r-- | src/tools/mmaps_generator/MapBuilder.h | 2 |
2 files changed, 4 insertions, 9 deletions
diff --git a/src/tools/mmaps_generator/MapBuilder.cpp b/src/tools/mmaps_generator/MapBuilder.cpp index 94b5f3607cf..3437355c0a9 100644 --- a/src/tools/mmaps_generator/MapBuilder.cpp +++ b/src/tools/mmaps_generator/MapBuilder.cpp @@ -171,19 +171,14 @@ namespace MMAP { while (1) { - uint32* mapId = nullptr; + uint32 mapId; _queue.WaitAndPop(mapId); if (_cancelationToken) return; - if (!mapId) // shouldn't happen? - continue; - - buildMap(*mapId); - - delete mapId; + buildMap(mapId); } } @@ -205,7 +200,7 @@ namespace MMAP if (!shouldSkipMap(mapId)) { if (threads > 0) - _queue.Push(new uint32(mapId)); + _queue.Push(mapId); else buildMap(mapId); } diff --git a/src/tools/mmaps_generator/MapBuilder.h b/src/tools/mmaps_generator/MapBuilder.h index c2168d048b4..1d688ccfa77 100644 --- a/src/tools/mmaps_generator/MapBuilder.h +++ b/src/tools/mmaps_generator/MapBuilder.h @@ -143,7 +143,7 @@ namespace MMAP rcContext* m_rcContext; std::vector<std::thread> _workerThreads; - ProducerConsumerQueue<uint32*> _queue; + ProducerConsumerQueue<uint32> _queue; std::atomic<bool> _cancelationToken; }; } |