← Back to branch summary

~ubuntu-branches/ubuntu/wily/mir/wily-proposed

« back to all changes in this revision

Viewing changes to src/server/report/default_server_configuration.cpp

  • Committer: Package Import Robot
  • Author(s): CI Train Bot
  • Date: 2015-05-12 13:12:55 UTC
  • mto: This revision was merged to the branch mainline in revision 96.
  • Revision ID: package-import@ubuntu.com-20150512131255-y7z12i8n4pbvo70x
Tags: upstream-0.13.0+15.10.20150512
Import upstream version 0.13.0+15.10.20150512

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/server/report/default_server_configuration.cpp
37
37
 
38
38
    if (opt == options::log_opt_value)
39
39
    {
40
 
        return std::unique_ptr<mir::report::ReportFactory>(new report::LoggingReportFactory(the_logger(), the_clock()));
 
40
        return std::make_unique<report::LoggingReportFactory>(the_logger(), the_clock());
41
41
    }
42
42
    else if (opt == options::lttng_opt_value)
43
43
    {
44
 
        return std::unique_ptr<mir::report::ReportFactory>(new report::LttngReportFactory());
 
44
        return std::make_unique<report::LttngReportFactory>();
45
45
    }
46
46
    else if (opt == options::off_opt_value)
47
47
    {
48
 
        return std::unique_ptr<mir::report::ReportFactory>(new report::NullReportFactory());
 
48
        return std::make_unique<report::NullReportFactory>();
49
49
    }
50
50
    else
51
51
    {