From 02e2552c134288815200aeaa85cd32d9a12c55ed Mon Sep 17 00:00:00 2001
From: Dan Goodliffe <dan@randomdan.homeip.net>
Date: Fri, 30 Dec 2016 02:14:14 +0000
Subject: Change return of setup function and service reference to be icetray
 specific

---
 icetray/dryice/dryice.cpp        | 2 +-
 icetray/dryice/dryice.h          | 3 ++-
 icetray/icetray/icetrayService.h | 1 +
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/icetray/dryice/dryice.cpp b/icetray/dryice/dryice.cpp
index f16a7fc..cdb11e1 100644
--- a/icetray/dryice/dryice.cpp
+++ b/icetray/dryice/dryice.cpp
@@ -5,7 +5,7 @@
 #include <Ice/Initialize.h>
 
 namespace IceTray {
-	typedef IceBox::Service *(* SetupFunction)(Ice::CommunicatorPtr);
+	typedef IceTray::Service *(* SetupFunction)(Ice::CommunicatorPtr);
 
 	DryIce * DryIce::currentDryIce = nullptr;
 
diff --git a/icetray/dryice/dryice.h b/icetray/dryice/dryice.h
index 33a3989..998f76d 100644
--- a/icetray/dryice/dryice.h
+++ b/icetray/dryice/dryice.h
@@ -4,6 +4,7 @@
 #include <Ice/Communicator.h>
 #include <IceBox/IceBox.h>
 #include <visibility.h>
+#include "icetrayService.h"
 
 namespace IceTray {
 	class DLL_PUBLIC DryIce {
@@ -20,7 +21,7 @@ namespace IceTray {
 			static DryIce * currentDryIce;
 
 			Ice::CommunicatorPtr ic;
-			IceBox::ServicePtr s;
+			IceTray::ServicePtr s;
 	};
 
 	class DLL_PUBLIC DryIceClient {
diff --git a/icetray/icetray/icetrayService.h b/icetray/icetray/icetrayService.h
index 8f35519..c59028a 100644
--- a/icetray/icetray/icetrayService.h
+++ b/icetray/icetray/icetrayService.h
@@ -20,6 +20,7 @@ namespace IceTray {
 			Ice::ObjectAdapterPtr adp;
 	};
 
+	typedef IceInternal::Handle<Service> ServicePtr;
 	typedef AdHoc::Factory<Service> ServiceFactory;
 	typedef AdHoc::Factory<DatabasePool, const std::string &, const std::string &, Ice::PropertiesPtr> PoolProvider;
 }
-- 
cgit v1.2.3