← Back to branch summary

~ubuntu-branches/ubuntu/trusty/location-service/trusty

« back to all changes in this revision

Viewing changes to examples/service/service.cpp

  • Committer: Package Import Robot
  • Author(s): Ubuntu daily release, thomas-voss
  • Date: 2014-02-04 12:36:02 UTC
  • mfrom: (1.1.17)
  • Revision ID: package-import@ubuntu.com-20140204123602-tges6gy8vtpa3oan
Tags: 0.0.2+14.04.20140204-0ubuntu1
https://launchpad.net/bugs/1240878
[ thomas-voss ]
* * Fix a race when a session is created while another one ends. *
  Ensure a sensible minimum interval between consecutive location
  updates in the GPS provider. (LP: #1240878)
* Adjust to changes in new dbus-cpp version.

Show diffs side-by-side

added added

removed removed

Lines of Context:
examples/service/service.cpp
22
22
#include "com/ubuntu/location/service/default_configuration.h"
23
23
#include "com/ubuntu/location/service/implementation.h"
24
24
 
25
 
#include <org/freedesktop/dbus/announcer.h>
26
 
#include <org/freedesktop/dbus/asio/executor.h>
 
25
#include <core/dbus/announcer.h>
 
26
#include <core/dbus/asio/executor.h>
27
27
 
28
28
#include <thread>
29
29
 
30
30
namespace cul = com::ubuntu::location;
31
31
namespace culs = com::ubuntu::location::service;
32
 
namespace dbus = org::freedesktop::dbus;
 
32
namespace dbus = core::dbus;
33
33
 
34
34
int main(int argc, char** argv)
35
35
{
124
124
        new dbus::Bus{lut.at(options.value_for_key<std::string>("bus"))}
125
125
    };
126
126
 
127
 
    bus->install_executor(
128
 
        dbus::Executor::Ptr(
129
 
            new dbus::asio::Executor{bus}));
 
127
    bus->install_executor(dbus::asio::make_executor(bus));
130
128
 
131
129
    culs::DefaultConfiguration config;
132
130