Refactored to use non-static data member initializers where it makes sense. Mixes...

[casparcg] / common / blocking_priority_queue.h

diff --git a/common/blocking_priority_queue.h b/common/blocking_priority_queue.h
index 7fd7e19fd3b4843e625ec7fbb34cbbc1d10de6b8..0bde37656fda0e0427b152228bcfd8f75915d79f 100644 (file)
--- a/common/blocking_priority_queue.h
+++ b/common/blocking_priority_queue.h
@@ -45,11 +45,11 @@ class blocking_priority_queue
 public:
        typedef unsigned int size_type;
 private:       
-       std::map<Prio, tbb::concurrent_queue<T>, std::greater<Prio>> queues_by_priority_;
-       semaphore space_available_;
-       semaphore elements_available_;
-       mutable boost::mutex capacity_mutex_;
-       size_type capacity_;
+       std::map<Prio, tbb::concurrent_queue<T>, std::greater<Prio>>    queues_by_priority_;
+       size_type                                                                                                               capacity_;
+       semaphore                                                                                                               space_available_        = capacity_;
+       semaphore                                                                                                               elements_available_     = 0u;
+       mutable boost::mutex                                                                                    capacity_mutex_;
 public:
        /**
         * Constructor.
@@ -60,9 +60,7 @@ public:
         */
        template<class PrioList>
        blocking_priority_queue(size_type capacity, const PrioList& priorities)
-               : space_available_(capacity)
-               , elements_available_(0u)
-               , capacity_(capacity)
+               : capacity_(capacity)
        {
                for (Prio priority : priorities)
                {