[Commit-gnuradio] [gnuradio] 01/02: Fixed initialization order of ctrlport static variables

[git]

This is an automated email from the git hooks/post-receive script.

jcorgan pushed a commit to branch maint
in repository gnuradio.

commit fde2c26aa9da54cfdb5cb18b6e722de031be65ae
Author: Kyle Unice <address@hidden>
Date:   Fri Oct 21 13:08:51 2016 -0700

    Fixed initialization order of ctrlport static variables
---
 gnuradio-runtime/lib/controlport/rpcmanager.cc         | 5 -----
 gnuradio-runtime/lib/controlport/rpcserver_selector.cc | 4 ++++
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/gnuradio-runtime/lib/controlport/rpcmanager.cc 
b/gnuradio-runtime/lib/controlport/rpcmanager.cc
index a67febe..fee2554 100644
--- a/gnuradio-runtime/lib/controlport/rpcmanager.cc
+++ b/gnuradio-runtime/lib/controlport/rpcmanager.cc
@@ -24,11 +24,6 @@
 #include <iostream>
 #include <stdexcept>
 
-bool rpcmanager::booter_registered(false);
-bool rpcmanager::aggregator_registered(false);
-std::auto_ptr<rpcserver_booter_base> rpcmanager::boot(0);
-std::auto_ptr<rpcserver_booter_aggregator> rpcmanager::aggregator(0);
-
 rpcmanager::rpcmanager() {;}
 
 rpcmanager::~rpcmanager() {;}
diff --git a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc 
b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
index 8f3b455..fcba1ab 100644
--- a/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
+++ b/gnuradio-runtime/lib/controlport/rpcserver_selector.cc
@@ -25,6 +25,10 @@
 #include <gnuradio/rpcserver_selector.h>
 
 bool rpcmanager::make_aggregator(false);
+bool rpcmanager::booter_registered(false);
+bool rpcmanager::aggregator_registered(false);
+std::auto_ptr<rpcserver_booter_base> rpcmanager::boot(0);
+std::auto_ptr<rpcserver_booter_aggregator> rpcmanager::aggregator(0);
 
 #ifdef GR_RPCSERVER_ENABLED
 rpcmanager manager_instance;