diff options
| author | Dan Goodliffe <dan@randomdan.homeip.net> | 2018-04-29 19:41:12 +0100 |
|---|---|---|
| committer | Dan Goodliffe <dan@randomdan.homeip.net> | 2018-04-29 19:41:12 +0100 |
| commit | 7cce01c40746c3e9925c1ecb4474b025bf2f9c1c (patch) | |
| tree | 01de3cb198f5df22a2aef1971a3dc306e29fa3a5 /p2pvr/carddaemon/carddaemon.cpp | |
| parent | Release events update transaction before beginning reschedule (diff) | |
| download | p2pvr-0.3.0.tar.bz2 p2pvr-0.3.0.tar.xz p2pvr-0.3.0.zip | |
C++17 and Ice 3.7p2pvr-0.3.0
Updates all components to be C++17 and Ice 3.7
Diffstat (limited to 'p2pvr/carddaemon/carddaemon.cpp')
| -rw-r--r-- | p2pvr/carddaemon/carddaemon.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/p2pvr/carddaemon/carddaemon.cpp b/p2pvr/carddaemon/carddaemon.cpp index c20ca4e..84c464d 100644 --- a/p2pvr/carddaemon/carddaemon.cpp +++ b/p2pvr/carddaemon/carddaemon.cpp @@ -1,15 +1,15 @@ #include <icetrayService.h> #include "devices.h" #include <Ice/ObjectAdapter.h> -#include <Ice/Communicator.h> +#include <Ice/Initialize.h> #include <IceUtil/Timer.h> namespace P2PVR { class CardDaemon : public IceTray::Service { public: - void addObjects(const std::string &, const Ice::CommunicatorPtr & ic, const Ice::StringSeq &, const Ice::ObjectAdapterPtr & adapter) override + void addObjects(const std::string &, const Ice::CommunicatorPtr &, const Ice::StringSeq &, const Ice::ObjectAdapterPtr & adapter) override { - adapter->add(new DevicesI(), ic->stringToIdentity("Devices")); + adapter->add(std::make_shared<DevicesI>(), Ice::stringToIdentity("Devices")); } }; |