Removed warning on 32-bit platforms

Author: craflin

Diff for: LockFreeLifoQueue.h

@@ -11,12 +11,8 @@ template <typename T> class LockFreeLifoQueue
     : _capacity(capacity)
   {
     _indexMask = capacity;
-    _indexMask |= _indexMask >> 1;
-    _indexMask |= _indexMask >> 2;
-    _indexMask |= _indexMask >> 4;
-    _indexMask |= _indexMask >> 8;
-    _indexMask |= _indexMask >> 16;
-    _indexMask |= _indexMask >> 32;
+    for(usize i = 1; i <= sizeof(void*) * 4; i <<= 1)
+      _indexMask |= _indexMask >> i;
     _abaOffset = _indexMask + 1;
 
     _queue = (Node*)Memory::alloc(sizeof(Node) * (capacity + 1));

Diff for: LockFreeQueue.h

@@ -10,12 +10,8 @@ template <typename T> class LockFreeQueue
   explicit LockFreeQueue(usize capacity)
   {
     _capacityMask = capacity - 1;
-    _capacityMask |= _capacityMask >> 1;
-    _capacityMask |= _capacityMask >> 2;
-    _capacityMask |= _capacityMask >> 4;
-    _capacityMask |= _capacityMask >> 8;
-    _capacityMask |= _capacityMask >> 16;
-    _capacityMask |= _capacityMask >> 32;
+    for(usize i = 1; i <= sizeof(void*) * 4; i <<= 1)
+      _capacityMask |= _capacityMask >> i;
     _capacity = _capacityMask + 1;
 
     _queue = (Node*)Memory::alloc(sizeof(Node) * _capacity);

Diff for: LockFreeQueueCpp11.h

@@ -10,12 +10,8 @@ template <typename T> class LockFreeQueueCpp11
   explicit LockFreeQueueCpp11(size_t capacity)
   {
     _capacityMask = capacity - 1;
-    _capacityMask |= _capacityMask >> 1;
-    _capacityMask |= _capacityMask >> 2;
-    _capacityMask |= _capacityMask >> 4;
-    _capacityMask |= _capacityMask >> 8;
-    _capacityMask |= _capacityMask >> 16;
-    _capacityMask |= _capacityMask >> 32;
+    for(size_t i = 1; i <= sizeof(void*) * 4; i <<= 1)
+      _capacityMask |= _capacityMask >> i;
     _capacity = _capacityMask + 1;
 
     _queue = (Node*)new char[sizeof(Node) * _capacity];

Diff for: LockFreeQueueSlow1.h

@@ -10,12 +10,8 @@ template <typename T> class LockFreeQueueSlow1
   explicit LockFreeQueueSlow1(usize capacity)
   {
     _capacityMask = capacity - 1;
-    _capacityMask |= _capacityMask >> 1;
-    _capacityMask |= _capacityMask >> 2;
-    _capacityMask |= _capacityMask >> 4;
-    _capacityMask |= _capacityMask >> 8;
-    _capacityMask |= _capacityMask >> 16;
-    _capacityMask |= _capacityMask >> 32;
+    for(usize i = 1; i <= sizeof(void*) * 4; i <<= 1)
+      _capacityMask |= _capacityMask >> i;
     _capacity = _capacityMask + 1;
 
     _queue = (Node*)Memory::alloc(sizeof(Node) * _capacity);

Diff for: LockFreeQueueSlow2.h

@@ -10,12 +10,8 @@ template <typename T> class LockFreeQueueSlow2
   explicit LockFreeQueueSlow2(usize capacity)
   {
     _capacityMask = capacity - 1;
-    _capacityMask |= _capacityMask >> 1;
-    _capacityMask |= _capacityMask >> 2;
-    _capacityMask |= _capacityMask >> 4;
-    _capacityMask |= _capacityMask >> 8;
-    _capacityMask |= _capacityMask >> 16;
-    _capacityMask |= _capacityMask >> 32;
+    for(usize i = 1; i <= sizeof(void*) * 4; i <<= 1)
+      _capacityMask |= _capacityMask >> i;
     _capacity = _capacityMask + 1;
 
     _queue = (Node*)Memory::alloc(sizeof(Node) * _capacity);

Diff for: LockFreeQueueSlow3.h

@@ -10,12 +10,8 @@ template <typename T> class LockFreeQueueSlow3
   explicit LockFreeQueueSlow3(usize capacity)
   {
     _capacityMask = capacity - 1;
-    _capacityMask |= _capacityMask >> 1;
-    _capacityMask |= _capacityMask >> 2;
-    _capacityMask |= _capacityMask >> 4;
-    _capacityMask |= _capacityMask >> 8;
-    _capacityMask |= _capacityMask >> 16;
-    _capacityMask |= _capacityMask >> 32;
+    for(usize i = 1; i <= sizeof(void*) * 4; i <<= 1)
+      _capacityMask |= _capacityMask >> i;
     _capacity = _capacityMask + 1;
 
     _queue = (Node*)Memory::alloc(sizeof(Node) * _capacity);

Diff for: MutexLockQueue.h

@@ -10,12 +10,8 @@ template <typename T> class MutexLockQueue
   explicit MutexLockQueue(usize capacity)
   {
     _capacityMask = capacity - 1;
-    _capacityMask |= _capacityMask >> 1;
-    _capacityMask |= _capacityMask >> 2;
-    _capacityMask |= _capacityMask >> 4;
-    _capacityMask |= _capacityMask >> 8;
-    _capacityMask |= _capacityMask >> 16;
-    _capacityMask |= _capacityMask >> 32;
+    for(usize i = 1; i <= sizeof(void*) * 4; i <<= 1)
+      _capacityMask |= _capacityMask >> i;
     _capacity = _capacityMask + 1;
 
     _queue = (Node*)Memory::alloc(sizeof(Node) * _capacity);

Diff for: SpinLockQueue.h

@@ -10,12 +10,8 @@ template <typename T> class SpinLockQueue
   explicit SpinLockQueue(usize capacity)
   {
     _capacityMask = capacity - 1;
-    _capacityMask |= _capacityMask >> 1;
-    _capacityMask |= _capacityMask >> 2;
-    _capacityMask |= _capacityMask >> 4;
-    _capacityMask |= _capacityMask >> 8;
-    _capacityMask |= _capacityMask >> 16;
-    _capacityMask |= _capacityMask >> 32;
+    for(usize i = 1; i <= sizeof(void*) * 4; i <<= 1)
+      _capacityMask |= _capacityMask >> i;
     _capacity = _capacityMask + 1;
 
     _queue = (Node*)Memory::alloc(sizeof(Node) * _capacity);

Diff for: mpmc_bounded_queue.h

@@ -26,12 +26,8 @@ class mpmc_bounded_queue
   static inline size_t nextPowerOfTwo(size_t buffer_size)
   {
     size_t result = buffer_size - 1;
-    result |= result >> 1;
-    result |= result >> 2;
-    result |= result >> 4;
-    result |= result >> 8;
-    result |= result >> 16;
-    result |= result >> 32;
+    for(size_t i = 1; i <= sizeof(void*) * 4; i <<= 1)
+      result |= result >> i;
     return result + 1;
   }
 public: