.

wcfs/client/wcfs.cpp

@@ -360,7 +360,7 @@ error _FileH::close() {
     // fileh could be opened for the same foid. Be careful not to erase it.
     wconn->_filehmu.lock();
     // XXX decref open count
-    if (wconn->_filehtab.get(fileh.foid) == &fileh)
+    if (wconn->_filehtab.get(fileh.foid)._ptr() == &fileh) // XXX _ptr() - or better teach `refptr<T> == T*` ?
         wconn->_filehtab.erase(fileh.foid);
     wconn->_filehmu.unlock();
 

wcfs/client/wcfs_watchlink.cpp

@@ -21,6 +21,7 @@
 #include "wcfs.h"
 #include "wcfs_watchlink.h"
 
+#include <golang/errors.h>
 #include <golang/fmt.h>
 #include <golang/strings.h>
 #include <string.h>
@@ -101,7 +102,7 @@ error _WatchLink::close() {
     // XXX -> we now have `kill -QUIT` to wcfs.go on test timeout - remove ^^^ comments?
     error err2 = wlink._serveWG->wait();
     // canceled is expected and ok
-    if (errors.Is(err2, context::canceled))
+    if (errors::Is(err2, context::canceled))
         err2 = nil;
 
     error err3 = wlink._f->close();