← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to src/client/lttng/rpc_report.h

  • Committer: Daniel van Vugt
  • Date: 2015-04-28 07:54:10 UTC
  • mfrom: (2517 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2673.
  • Revision ID: daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/client/lttng/rpc_report.h
37
37
    void invocation_failed(mir::protobuf::wire::Invocation const& invocation,
38
38
                           std::exception const& ex) override;
39
39
 
40
 
    void header_receipt_failed(std::exception const& ex) override;
41
40
    void result_receipt_succeeded(mir::protobuf::wire::Result const& result) override;
42
41
    void result_receipt_failed(std::exception const& ex) override;
43
42
 
53
52
    void file_descriptors_received(google::protobuf::Message const& response,
54
53
                                   std::vector<Fd> const& fds) override;
55
54
 
56
 
    void connection_failure(std::exception const& ex) override;
57
 
 
58
55
private:
59
56
    ClientTracepointProvider tp_provider;
60
57
};