← Back to branch summary

~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to src/server/frontend/protobuf_responder.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/server/frontend/protobuf_responder.h
23
23
#include "mir_protobuf_wire.pb.h"
24
24
 
25
25
#include <memory>
 
26
#include <mutex>
26
27
 
27
28
namespace mir
28
29
{
50
51
    std::shared_ptr<MessageSender> const sender;
51
52
    std::shared_ptr<ResourceCache> const resource_cache;
52
53
 
 
54
    std::mutex result_guard;
53
55
    mir::protobuf::wire::Result send_response_result;
54
56
};
55
57
}