-CommImplPtr MailboxImpl::find_matching_comm(CommImpl::Type type, int (*match_fun)(void*, void*, CommImpl*),
- void* this_user_data, CommImplPtr my_synchro, bool done,
+CommImplPtr MailboxImpl::find_matching_comm(CommImpl::Type type, bool (*match_fun)(void*, void*, CommImpl*),
+ void* this_user_data, const CommImplPtr& my_synchro, bool done,