1 files changed, 52 insertions, 56 deletions
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_aggregator.cc b/gnuradio-runtime/lib/controlport/rpcserver_aggregator.cc
index e81a899626..6a2f6c80e4 100644
--- a/gnuradio-runtime/lib/controlport/rpcserver_aggregator.cc
+++ b/gnuradio-runtime/lib/controlport/rpcserver_aggregator.cc
@@ -26,87 +26,83 @@
 #include <sstream>
 #include <stdexcept>
 
-rpcserver_aggregator::rpcserver_aggregator()
-  : d_type(std::string("aggregator"))
-{;}
+rpcserver_aggregator::rpcserver_aggregator() : d_type(std::string("aggregator")) { ; }
 
-rpcserver_aggregator::~rpcserver_aggregator()
-{;}
+rpcserver_aggregator::~rpcserver_aggregator() { ; }
 
-const std::string&
-rpcserver_aggregator::type()
-{
-  return d_type;
-}
+const std::string& rpcserver_aggregator::type() { return d_type; }
 
-const std::vector<std::string>&
-rpcserver_aggregator::registeredServers()
+const std::vector<std::string>& rpcserver_aggregator::registeredServers()
 {
-  return d_registeredServers;
+    return d_registeredServers;
 }
 
-void
-rpcserver_aggregator::registerConfigureCallback(const std::string &id,
-						const configureCallback_t callback)
+void rpcserver_aggregator::registerConfigureCallback(const std::string& id,
+                                                     const configureCallback_t callback)
 {
-  std::for_each(d_serverlist.begin(), d_serverlist.end(),
-		registerConfigureCallback_f<rpcmanager_base::rpcserver_booter_base_sptr, configureCallback_t>(id, callback));
+    std::for_each(d_serverlist.begin(),
+                  d_serverlist.end(),
+                  registerConfigureCallback_f<rpcmanager_base::rpcserver_booter_base_sptr,
+                                              configureCallback_t>(id, callback));
 }
 
-void
-rpcserver_aggregator::unregisterConfigureCallback(const std::string &id)
+void rpcserver_aggregator::unregisterConfigureCallback(const std::string& id)
 {
-  std::for_each(d_serverlist.begin(), d_serverlist.end(),
-		unregisterConfigureCallback_f<rpcmanager_base::rpcserver_booter_base_sptr, configureCallback_t>(id));
+    std::for_each(
+        d_serverlist.begin(),
+        d_serverlist.end(),
+        unregisterConfigureCallback_f<rpcmanager_base::rpcserver_booter_base_sptr,
+                                      configureCallback_t>(id));
 }
 
-void
-rpcserver_aggregator::registerQueryCallback(const std::string &id, const queryCallback_t callback)
+void rpcserver_aggregator::registerQueryCallback(const std::string& id,
+                                                 const queryCallback_t callback)
 {
-  std::for_each(d_serverlist.begin(), d_serverlist.end(),
-		registerQueryCallback_f<rpcmanager_base::rpcserver_booter_base_sptr, queryCallback_t>(id, callback));
+    std::for_each(d_serverlist.begin(),
+                  d_serverlist.end(),
+                  registerQueryCallback_f<rpcmanager_base::rpcserver_booter_base_sptr,
+                                          queryCallback_t>(id, callback));
 }
 
-void
-rpcserver_aggregator::unregisterQueryCallback(const std::string &id)
+void rpcserver_aggregator::unregisterQueryCallback(const std::string& id)
 {
-  std::for_each(d_serverlist.begin(), d_serverlist.end(),
-		unregisterQueryCallback_f<rpcmanager_base::rpcserver_booter_base_sptr, queryCallback_t>(id));
+    std::for_each(d_serverlist.begin(),
+                  d_serverlist.end(),
+                  unregisterQueryCallback_f<rpcmanager_base::rpcserver_booter_base_sptr,
+                                            queryCallback_t>(id));
 }
 
 
-
-void
-rpcserver_aggregator::registerHandlerCallback(const std::string &id,
-                                              const handlerCallback_t callback)
+void rpcserver_aggregator::registerHandlerCallback(const std::string& id,
+                                                   const handlerCallback_t callback)
 {
-  std::for_each(d_serverlist.begin(), d_serverlist.end(),
-		registerHandlerCallback_f<rpcmanager_base::rpcserver_booter_base_sptr, handlerCallback_t>(id, callback));
+    std::for_each(d_serverlist.begin(),
+                  d_serverlist.end(),
+                  registerHandlerCallback_f<rpcmanager_base::rpcserver_booter_base_sptr,
+                                            handlerCallback_t>(id, callback));
 }
 
-void
-rpcserver_aggregator::unregisterHandlerCallback(const std::string &id)
+void rpcserver_aggregator::unregisterHandlerCallback(const std::string& id)
 {
-  std::for_each(d_serverlist.begin(), d_serverlist.end(),
-		unregisterHandlerCallback_f<rpcmanager_base::rpcserver_booter_base_sptr, handlerCallback_t>(id));
+    std::for_each(d_serverlist.begin(),
+                  d_serverlist.end(),
+                  unregisterHandlerCallback_f<rpcmanager_base::rpcserver_booter_base_sptr,
+                                              handlerCallback_t>(id));
 }
 
 
-
-void
-rpcserver_aggregator::registerServer(rpcmanager_base::rpcserver_booter_base_sptr server)
+void rpcserver_aggregator::registerServer(
+    rpcmanager_base::rpcserver_booter_base_sptr server)
 {
-  std::vector<std::string>::iterator it(std::find(d_registeredServers.begin(),
-						  d_registeredServers.end(),
-						  server->type()));
-  if(it != d_registeredServers.end()) {
-    d_serverlist.push_back(server);
-    d_registeredServers.push_back(server->type());
-  }
-  else {
-    std::stringstream s;
-    s << "rpcserver_aggregator::registerServer: server of type "
-      << server->type() << " already registered" << std::endl;
-    throw std::runtime_error(s.str().c_str());
-  }
+    std::vector<std::string>::iterator it(std::find(
+        d_registeredServers.begin(), d_registeredServers.end(), server->type()));
+    if (it != d_registeredServers.end()) {
+        d_serverlist.push_back(server);
+        d_registeredServers.push_back(server->type());
+    } else {
+        std::stringstream s;
+        s << "rpcserver_aggregator::registerServer: server of type " << server->type()
+          << " already registered" << std::endl;
+        throw std::runtime_error(s.str().c_str());
+    }
 }