From 8270a257917461d4b7a2da543dc647d8ee5171af Mon Sep 17 00:00:00 2001
From: Michael Davidsaver <mdavidsaver@gmail.com>
Date: Wed, 21 Jun 2017 15:13:58 +0200
Subject: [PATCH] Re-add ServerContext::getChannelProviders()

---
 src/server/pv/serverContext.h     | 2 ++
 src/server/pv/serverContextImpl.h | 4 ++--
 src/server/serverContext.cpp      | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/server/pv/serverContext.h b/src/server/pv/serverContext.h
index 5d6b697..b9873b3 100644
--- a/src/server/pv/serverContext.h
+++ b/src/server/pv/serverContext.h
@@ -90,6 +90,8 @@ public:
      */
     virtual Configuration::shared_pointer getCurrentConfig() = 0;
 
+    virtual const std::vector<ChannelProvider::shared_pointer>& getChannelProviders() =0;
+
     // ************************************************************************** //
     // **************************** [ Plugins ] ********************************* //
     // ************************************************************************** //
diff --git a/src/server/pv/serverContextImpl.h b/src/server/pv/serverContextImpl.h
index 7324c57..9263bbf 100644
--- a/src/server/pv/serverContextImpl.h
+++ b/src/server/pv/serverContextImpl.h
@@ -104,7 +104,7 @@ public:
      * Get server newtwork (IP) address.
      * @return server network (IP) address, <code>NULL</code> if not bounded.
      */
-    osiSockAddr* getServerInetAddress();
+    const osiSockAddr *getServerInetAddress();
 
     /**
      * Broadcast (UDP send) transport.
@@ -116,7 +116,7 @@ public:
      * Get channel providers.
      * @return channel providers.
      */
-    std::vector<ChannelProvider::shared_pointer>& getChannelProviders();
+    virtual std::vector<ChannelProvider::shared_pointer>& getChannelProviders() OVERRIDE FINAL;
 
     /**
      * Return <code>true</code> if channel provider name is provided by configuration (e.g. system env. var.).
diff --git a/src/server/serverContext.cpp b/src/server/serverContext.cpp
index 70f8bca..e5d461e 100644
--- a/src/server/serverContext.cpp
+++ b/src/server/serverContext.cpp
@@ -466,7 +466,7 @@ BeaconServerStatusProvider::shared_pointer ServerContextImpl::getBeaconServerSta
     return _beaconServerStatusProvider;
 }
 
-osiSockAddr* ServerContextImpl::getServerInetAddress()
+const osiSockAddr* ServerContextImpl::getServerInetAddress()
 {
     if(_acceptor.get())
     {