.

wcfs/internal/wcfs_misc.h

@@ -50,6 +50,10 @@ using std::tie;
 #include <vector>
 using std::vector;
 
+#include <functional>
+using std::function;
+
+
 // nil is synonym for nullptr and NULL.
 const nullptr_t nil = nullptr;
 

wcfs/internal/wcfs_watchlink.cpp

@@ -49,8 +49,9 @@ pair<WatchLink, error> WCFS::_openwatch() {
     wlink->_rxdown    = false;
     wlink->_req_next  = 1;
 
+    context::Context serveCtx;
+    tie(serveCtx, wlink->_serveCancel) = context::with_cancel(context::background());
 #if 0
-    serveCtx, wlink._serveCancel = context.with_cancel(context.background())
     wlink->_serveWG = sync.WorkGroup(serveCtx)
     wlink->_serveWG.go(wlink._serveRX)
 #endif

wcfs/internal/wcfs_watchlink.h

@@ -86,8 +86,8 @@ class _WatchLink : public object {
     sync::Mutex     _txmu;      // serializes writes
     sync::Once      _txclose1;
 
+    function<void()> _serveCancel;
 #if 0
-    func() _serveCancel
     sync.WorkGroup *_serveWG
 #endif