From: Mika Laitio Date: Mon, 28 Feb 2011 22:42:05 +0000 (+0200) Subject: Started cleaning up public headers from the private headers that are not X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=0952f28a1eb9a947768170208839cd2c6bb472ac;p=libplpbus.git Started cleaning up public headers from the private headers that are not wanted to install. Signed-off-by: Mika Laitio --- diff --git a/src/Makefile.am b/src/Makefile.am index 7e26785..515e06a 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -18,5 +18,6 @@ libplpbusincludedir=$(includedir)/plp/bus libplpbusinclude_HEADERS = \ plpbus/BusServer.hh \ plpbus/BusClient.hh \ - plpbus/BusMessage.hh + plpbus/BusMessage.hh \ + plpbus/IServerListener.hh diff --git a/src/plpbus/BusServer.cc b/src/plpbus/BusServer.cc index 44281ed..993c995 100644 --- a/src/plpbus/BusServer.cc +++ b/src/plpbus/BusServer.cc @@ -1,4 +1,5 @@ #include "BusServer.hh" +#include "OrbServerImpl.hh" using namespace std; using namespace plpbus; @@ -14,30 +15,39 @@ BusServer::~BusServer() } int BusServer::init() { - int retVal; + int retVal; + OrbServerImpl *impl; retVal = 0; - orbServer->init(); + impl = (OrbServerImpl *)orbServer; + impl->init(); return retVal; } int BusServer::launch(const char *server_name) { - int retVal; + int retVal; + OrbServerImpl *impl; - retVal = orbServer->launch(server_name); + impl = (OrbServerImpl *)orbServer; + retVal = impl->launch(server_name); return retVal; } int BusServer::add_server_listener(IServerListener *listener_param) { - int retVal; + int retVal; + OrbServerImpl *impl; - retVal = orbServer->add_server_listener(listener_param); + impl = (OrbServerImpl *)orbServer; + retVal = impl->add_server_listener(listener_param); return retVal; } void BusServer::shutdown() { - orbServer->shutdown(); + OrbServerImpl *impl; + + impl = (OrbServerImpl *)orbServer; + impl->shutdown(); } diff --git a/src/plpbus/BusServer.hh b/src/plpbus/BusServer.hh index 734ba65..8244e73 100644 --- a/src/plpbus/BusServer.hh +++ b/src/plpbus/BusServer.hh @@ -6,7 +6,7 @@ #include "RequestResponseBus.hh" #include "IServerListener.hh" -#include "OrbServerImpl.hh" +//#include "OrbServerImpl.hh" namespace plpbus { class BusServer { @@ -18,7 +18,7 @@ namespace plpbus { virtual int add_server_listener(IServerListener *listener_param); virtual void shutdown(); private: - OrbServerImpl *orbServer; + void *orbServer; }; }