Changes in src/libcfa/bits/containers.h [a1a17a74:705e612]

File:

• src/libcfa/bits/containers.h (modified) (2 diffs)

src/libcfa/bits/containers.h

@@ -220 +220 @@
         }
 
-        #define next 0
-        #define prev 1
+        #define _next .0
+        #define _prev .1
         forall(dtype T | sized(T))
         static inline void push_front( __dllist(T) & this, T & node ) with( this ) {
-                verify(__get);
                 if ( head ) {
-                        __get( node ).next = head;
-                        __get( node ).prev = __get( *head ).prev;
+                        __get( node )_next = head;
+                        __get( node )_prev = __get( *head )_prev;
                         // inserted node must be consistent before it is seen
                         // prevent code movement across barrier
                         asm( "" : : : "memory" );
-                        __get( *head ).prev = &node;
-                        T & _prev = *__get( node ).prev;
-                        __get( _prev ).next = &node;
+                        __get( *head )_prev = &node;
+                        T & prev = *__get( node )_prev;
+                        __get( prev )_next = &node;
                 }
                 else {
-                        __get( node ).next = &node;
-                        __get( node ).prev = &node;
+                        __get( node )_next = &node;
+                        __get( node )_prev = &node;
                 }
 
@@ -247 +246 @@
         forall(dtype T | sized(T))
         static inline void remove( __dllist(T) & this, T & node ) with( this ) {
-                verify(__get);
                 if ( &node == head ) {
-                        if ( __get( *head ).next == head ) {
+                        if ( __get( *head )_next == head ) {
                                 head = NULL;
                         }
                         else {
-                                head = __get( *head ).next;
+                                head = __get( *head )_next;
                         }
                 }
-                __get( *__get( node ).next ).prev = __get( node ).prev;
-                __get( *__get( node ).prev ).next = __get( node ).next;
-                __get( node ).next = NULL;
-                __get( node ).prev = NULL;
-        }
-        #undef next
-        #undef prev
+                __get( *__get( node )_next )_prev = __get( node )_prev;
+                __get( *__get( node )_prev )_next = __get( node )_next;
+                __get( node )_next = NULL;
+                __get( node )_prev = NULL;
+        }
+        #undef _next
+        #undef _prev
 #endif