Use git diff instead of diff-index for setlocalversion.

[loba.git] / sync_queue.h

diff --git a/sync_queue.h b/sync_queue.h
index c3f29e566f0b849a32c21a92c4e140a6f6c46d44..55d2e7949933e756efd571c30f28762b552c37c3 100644 (file)
--- a/sync_queue.h
+++ b/sync_queue.h
@@ -1,17 +1,7 @@
 #ifndef SYNC_QUEUE_H
 #define SYNC_QUEUE_H
 
 #ifndef SYNC_QUEUE_H
 #define SYNC_QUEUE_H
 

-#if __GNUC__ == 4 && __GNUC_MINOR__ == 4
-#  include <cstdatomic>         // <atomic> is named <cstdatomic> in gcc 4.4
-
-template<typename _Tp>          // fix missing definition in gcc 4.4
-void
-atomic<_Tp*>::store(_Tp* __v, memory_order __m) volatile
-{ atomic_address::store(__v, __m); }
-
-#else
-#  include <atomic>
-#endif
+#include <atomic>

 
 #define SYNC_QUEUE_BUFSIZE 16
 
 
 #define SYNC_QUEUE_BUFSIZE 16
 


@@ -28,7 +18,7 @@ public:
     ~sync_queue()
     {
         node* n = head_node;
     ~sync_queue()
     {
         node* n = head_node;

-        while (n != NULL) {
+        while (n != nullptr) {

             node* prev = n;
             n = n->next;
             delete prev;
             node* prev = n;
             n = n->next;
             delete prev;


@@ -94,7 +84,7 @@ public:
 
 private:
     struct node {
 
 private:
     struct node {

-        node(): next(NULL) { }
+        node(): next(nullptr) { }

         T values[SYNC_QUEUE_BUFSIZE];
         node* next;
     };
         T values[SYNC_QUEUE_BUFSIZE];
         node* next;
     };