Updates following boost::function removal from adaptor