← Back to branch summary

~mterry/unity-scopes-api/snap-root

« back to all changes in this revision

Viewing changes to include/unity/scopes/internal/RegistryObject.h

  • Committer: CI Train Bot
  • Author(s): Pawel Stolowski
  • Date: 2016-03-17 22:35:14 UTC
  • mfrom: (261.1.54 staging)
  • Revision ID: ci-train-bot@canonical.com-20160317223514-dxndlxrg5jbi2oqk
Merged devel: use abigail for abi-compoliance checker (disabled for now due o abigail bugs); filters API changes.
Approved by: Michi Henning, PS Jenkins bot

Show diffs side-by-side

added added

removed removed

Lines of Context:
include/unity/scopes/internal/RegistryObject.h
100
100
 
101
101
        ScopeProcess(ScopeExecData exec_data,
102
102
                     std::weak_ptr<MWPublisher> const& publisher,
103
 
                     boost::log::sources::severity_channel_logger_mt<>& logger);
 
103
                     unity::scopes::internal::Logger& logger);
104
104
        ~ScopeProcess();
105
105
 
106
106
        ProcessState state() const;
131
131
        core::posix::ChildProcess process_ = core::posix::ChildProcess::invalid();
132
132
        std::weak_ptr<MWPublisher> reg_publisher_; // weak_ptr, so processes don't hold publisher alive
133
133
        bool manually_started_;
134
 
        boost::log::sources::severity_channel_logger_mt<>& logger_;
 
134
        unity::scopes::internal::Logger& logger_;
135
135
    };
136
136
 
137
137
private:
138
138
    std::unique_ptr<unity::scopes::internal::Logger> test_logger_;
139
 
    boost::log::sources::severity_channel_logger_mt<>& logger_;
 
139
    unity::scopes::internal::Logger& logger_;
140
140
 
141
141
    core::posix::ChildProcess::DeathObserver& death_observer_;
142
142
    core::ScopedConnection death_observer_connection_;