← Back to branch summary

~thomas-voss/location-service/less-conservative-about-connection-characteristics

« back to all changes in this revision

Viewing changes to src/location_service/com/ubuntu/location/service/daemon.cpp

  • Committer: Thomas Voß
  • Date: 2015-11-26 08:28:38 UTC
  • mto: This revision was merged to the branch mainline in revision 205.
  • Revision ID: thomas.voss@canonical.com-20151126082838-1aosh05v978vgwbl
Remove dependency on robustify-...

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/location_service/com/ubuntu/location/service/daemon.cpp
21
21
#include <com/ubuntu/location/provider_factory.h>
22
22
 
23
23
#include <com/ubuntu/location/logging.h>
24
 
#include <com/ubuntu/location/dispatching_provider.h>
25
24
#include <com/ubuntu/location/connectivity/dummy_connectivity_manager.h>
26
25
 
27
26
#include <com/ubuntu/location/service/default_configuration.h>
200
199
                            config.provider_options.at(provider) : empty_provider_configuration);
201
200
 
202
201
            if (p)
203
 
                instantiated_providers.insert(
204
 
                            location::DispatchingProvider::create(
205
 
                                runtime->to_dispatcher_functional(), p));
 
202
                instantiated_providers.insert(p);
206
203
            else
207
204
                throw std::runtime_error("Problem instantiating provider");
208
205