← Back to branch summary

~thomas-voss/trust-store/fix-1354092

« back to all changes in this revision

Viewing changes to src/core/trust/mir/agent.cpp

  • Committer: CI bot
  • Author(s): Alberto Aguirre
  • Date: 2014-10-06 16:36:14 UTC
  • mfrom: (43.1.3 trust-store)
  • Revision ID: ps-jenkins@lists.canonical.com-20141006163614-lgma3qcfu3niw3su
Attempt mir connection more than once Fixes: 1377159
Approved by: PS Jenkins bot, Thomas Voß

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/core/trust/mir/agent.cpp
17
17
 */
18
18
 
19
19
#include "agent.h"
20
 
 
21
20
#include "prompt_main.h"
 
21
#include <core/trust/mir_agent.h>
22
22
 
23
23
// For getuid
24
24
#include <fcntl.h>
90
90
mir::ConnectionVirtualTable::ConnectionVirtualTable(MirConnection* connection)
91
91
    : connection{connection}
92
92
{
93
 
    if (mir_connection_is_valid(connection) == mir_false) throw std::runtime_error
 
93
    if (mir_connection_is_valid(connection) == mir_false) throw InvalidMirConnection
94
94
    {
95
95
        "Cannot create instance for invalid connection to Mir."
96
96
    };
267
267
    return std::tie(lhs.application_id, lhs.description, lhs.fd) == std::tie(rhs.application_id, rhs.description, rhs.fd);
268
268
}
269
269
 
270
 
#include <core/trust/mir_agent.h>
271
 
 
272
270
#include "config.h"
273
271
 
274
272
MirConnection* mir::connect(const std::string& endpoint, const std::string& name)