[Commit-gnuradio] [gnuradio] 16/50: controlport: switching rpcpmtconverter::to_pmt() to To_PMT singleton

[git]

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

jcorgan pushed a commit to branch master
in repository gnuradio.

commit 61477c20b4d649ca5364c31cdd6e47fccf2fbbf8
Author: Nate Goergen <address@hidden>
Date:   Sun Mar 1 00:59:36 2015 -0600

    controlport: switching rpcpmtconverter::to_pmt() to To_PMT singleton
---
 gnuradio-runtime/include/gnuradio/rpcpmtconverters_thrift.h        | 1 -
 gnuradio-runtime/include/gnuradio/rpcserver_thrift.h               | 2 +-
 gnuradio-runtime/lib/controlport/thrift/rpcpmtconverters_thrift.cc | 6 ------
 3 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/gnuradio-runtime/include/gnuradio/rpcpmtconverters_thrift.h 
b/gnuradio-runtime/include/gnuradio/rpcpmtconverters_thrift.h
index 25c8b5f..5a0402c 100644
--- a/gnuradio-runtime/include/gnuradio/rpcpmtconverters_thrift.h
+++ b/gnuradio-runtime/include/gnuradio/rpcpmtconverters_thrift.h
@@ -30,7 +30,6 @@
 
 namespace rpcpmtconverter
 {
-  pmt::pmt_t to_pmt(const GNURadio::Knob& knob);
   GNURadio::Knob from_pmt(const pmt::pmt_t& knob);
 
   struct to_pmt_f {
diff --git a/gnuradio-runtime/include/gnuradio/rpcserver_thrift.h 
b/gnuradio-runtime/include/gnuradio/rpcserver_thrift.h
index d0dc069..9f6faf1 100644
--- a/gnuradio-runtime/include/gnuradio/rpcserver_thrift.h
+++ b/gnuradio-runtime/include/gnuradio/rpcserver_thrift.h
@@ -76,7 +76,7 @@ public:
       ConfigureCallbackMap_t::const_iterator 
iter(d_setcallbackmap.find(p.first));
       if(iter != d_setcallbackmap.end()) {
         if(cur_priv <= iter->second.priv) {
-          (*iter->second.callback).post(pmt::PMT_NIL, 
rpcpmtconverter::to_pmt(p.second));
+          (*iter->second.callback).post(pmt::PMT_NIL, 
rpcpmtconverter::To_PMT::instance(p.second));
         }
         else {
           std::cout << "Key " << p.first << " requires PRIVLVL <= "
diff --git a/gnuradio-runtime/lib/controlport/thrift/rpcpmtconverters_thrift.cc 
b/gnuradio-runtime/lib/controlport/thrift/rpcpmtconverters_thrift.cc
index 967f140..a16f2ad 100644
--- a/gnuradio-runtime/lib/controlport/thrift/rpcpmtconverters_thrift.cc
+++ b/gnuradio-runtime/lib/controlport/thrift/rpcpmtconverters_thrift.cc
@@ -251,9 +251,3 @@ rpcpmtconverter::To_PMT::operator()(const GNURadio::Knob& 
knob)
 {
        return to_pmt_map[knob.type](knob);
 }
-
-pmt::pmt_t
-rpcpmtconverter::to_pmt(const GNURadio::Knob& knob)
-{
-       return rpcpmtconverter::To_PMT::instance(knob);
-}