Add ckloop back to the build

Author: adityapb

CMakeLists.txt

@@ -923,16 +923,14 @@ configure_file(src/scripts/testrun bin/ COPYONLY)
 # Charm++ libraries
 
 # CkLoop
-#[[
 set(ckloop-cxx-files src/libs/ck-libs/ckloop/CkLoop.C)
-#set(ckloop-h-files src/libs/ck-libs/ckloop/CkLambda.h src/libs/ck-libs/ckloop/CkLoopAPI.h src/libs/ck-libs/ckloop/CkLoop.h)
-#add_library(moduleCkLoop ${ckloop-cxx-files} ${ckloop-h-files} ${CMAKE_BINARY_DIR}/include/CkLoop.decl.h)
-#add_dependencies(moduleCkLoop ck)
+set(ckloop-h-files src/libs/ck-libs/ckloop/CkLambda.h src/libs/ck-libs/ckloop/CkLoopAPI.h src/libs/ck-libs/ckloop/CkLoop.h)
+add_library(moduleCkLoop ${ckloop-cxx-files} ${ckloop-h-files} ${CMAKE_BINARY_DIR}/include/CkLoop.decl.h)
+add_dependencies(moduleCkLoop ck)
 
-#foreach(file ${ckloop-h-files})
-  #configure_file(${file} ${CMAKE_BINARY_DIR}/include COPYONLY)
-#endforeach(file)
-]]
+foreach(file ${ckloop-h-files})
+  configure_file(${file} ${CMAKE_BINARY_DIR}/include COPYONLY)
+endforeach(file)
 
 # allGather
 configure_file(src/libs/ck-libs/allGather/allGather.h  ${CMAKE_BINARY_DIR}/include COPYONLY)

src/conv-core/taskqueue.h

@@ -13,6 +13,7 @@ typedef LONG taskq_idx;
 #else
 typedef int taskq_idx;
 #endif
+#include "converse.h"
 typedef struct TaskQueueStruct {
   taskq_idx head; // This pointer indicates the first task in the queue
   taskq_idx tail; // The tail indicates the array element next to the last available task in the queue. So, if head == tail, the queue is empty