From fa9b122ecf747348a4edbc02f4d38479faa6744e Mon Sep 17 00:00:00 2001
From: Alex Rousskov <rousskov@measurement-factory.com>
Date: Sat, 1 Feb 2014 19:47:05 -0700
Subject: [PATCH] Comm job callbacks need job's cbdata pointer, not a job
 pointer.

Otherwise, in complex inheritance hierarchies, some [inner] classes will
hit cbdata cookie assertions when scheduling Comm calls with callbacks.
---
 src/CommCalls.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/CommCalls.h b/src/CommCalls.h
index 5003e78faa..2af0fbab18 100644
--- a/src/CommCalls.h
+++ b/src/CommCalls.h
@@ -176,7 +176,7 @@ public:
     typedef void (C::*Method)(const Params &io);
 
     CommCbMemFunT(const CbcPointer<C> &aJob, Method aMeth): JobDialer<C>(aJob),
-            CommDialerParamsT<Params_>(aJob.get()),
+            CommDialerParamsT<Params_>(aJob->toCbdata()),
             method(aMeth) {}
 
     virtual bool canDial(AsyncCall &c) {
-- 
2.47.2