diff options
Diffstat (limited to 'icetray/dryice')
| -rw-r--r-- | icetray/dryice/Jamfile.jam | 1 | ||||
| -rw-r--r-- | icetray/dryice/dryice.cpp | 9 |
2 files changed, 1 insertions, 9 deletions
diff --git a/icetray/dryice/Jamfile.jam b/icetray/dryice/Jamfile.jam index 6df0569..0be9092 100644 --- a/icetray/dryice/Jamfile.jam +++ b/icetray/dryice/Jamfile.jam @@ -12,7 +12,6 @@ lib dryice : <library>..//pthread <library>..//boost_system <library>..//boost_thread - <library>..//dl <implicit-dependency>../icetray//icetray : : <include>. diff --git a/icetray/dryice/dryice.cpp b/icetray/dryice/dryice.cpp index 744e0a6..5223ca6 100644 --- a/icetray/dryice/dryice.cpp +++ b/icetray/dryice/dryice.cpp @@ -1,22 +1,15 @@ #include "dryice.h" #include <boost/assert.hpp> -#include <dlfcn.h> #include <factory.h> #include <Ice/Initialize.h> #include <Ice/ObjectAdapter.h> namespace IceTray { - typedef IceTray::Service *(* SetupFunction)(Ice::CommunicatorPtr); - DryIce * DryIce::currentDryIce = nullptr; DryIce::DryIce(const Ice::StringSeq & cmdline) { BOOST_ASSERT(!currentDryIce); - void * i = dlsym(NULL, "createIceTrayService"); - BOOST_VERIFY(i); - auto sf = (SetupFunction)i; - BOOST_VERIFY(sf); Ice::StringSeq args; Ice::InitializationData id; id.properties = Ice::createProperties(); @@ -24,7 +17,7 @@ namespace IceTray { id.properties->setProperty("DryIce.PoolProvider", "MockPool"); id.properties->parseCommandLineOptions("", cmdline); ic = Ice::initialize(args, id); - s = sf(nullptr); + s = Service::create(ic); s->start("DryIce", ic, {}); currentDryIce = this; } |