Changes in libcfa/src/bits/collection.hfa [58870e6b:accc5dbb]

File:

• libcfa/src/bits/collection.hfa (modified) (5 diffs)

libcfa/src/bits/collection.hfa

@@ -1 +1 @@
 #pragma once
+#include <stdio.h> // REMOVE THIS AFTER DEBUGGING
+
 
 struct Colable {
-        Colable * next;                                                                         // next node in the list
+        struct Colable * next;                                                                          // next node in the list
         // invariant: (next != 0) <=> listed()
 };
-
-inline {
+#ifdef __cforall
+static inline {
         // PUBLIC
 
@@ -28 +30 @@
         }
 
-        // wrappers to make Collection have T
-        forall( dtype T ) {
-                T *& Next( T * n ) {
-                        return (T *)Next( (Colable *)n );
-                }
+        // // wrappers to make Collection have T
+        // forall( dtype T ) {
+        //      T *& Next( T * n ) {
+        //              return (T *)Next( (Colable *)n );
+        //      }
 
-                bool listed( T * n ) {
-                        return Next( (Colable *)n ) != 0p;
-                }
-        } // distribution
+        //      bool listed( T * n ) {
+        //              return Next( (Colable *)n ) != 0p;
+        //      }
+        // } // distribution
 } // distribution
 
@@ -45 +47 @@
 };
 
-inline {
+static inline {
         // class invariant: root == 0 & empty() | *root in *this
         void ?{}( Collection &, const Collection & ) = void; // no copy
@@ -68 +70 @@
 };
 
-inline {
+static inline {
         void ?{}( ColIter & colIter ) with( colIter ) {
                 curr = 0p;
@@ -79 +81 @@
         } // distribution
 } // distribution
+#endif