Merged CLK changes from trunk, and separated delimiter message splitting and codepage...

[casparcg] / common / blocking_priority_queue.h

diff --git a/common/blocking_priority_queue.h b/common/blocking_priority_queue.h
index 32518d78926386d5e3040e9484d0d4ad7f32a09e..f8cd0198cb4441a2cafb9e8439c039197c2a3cd2 100644 (file)
--- a/common/blocking_priority_queue.h
+++ b/common/blocking_priority_queue.h
@@ -72,7 +72,7 @@ public:
 
                // The std::map is read-only from now on, so there *should* (it is 
                // unlikely but possible for a std::map implementor to choose to 
-               // rebalance the tree during read operations) be no race  conditions 
+               // rebalance the tree during read operations) be no race conditions
                // regarding the map.
                //
                // This may be true for vc10 as well:
@@ -124,7 +124,6 @@ public:
        {
                acquire_transaction transaction(elements_available_);
 
-
                pop_acquired_any_priority(element, transaction);
        }