4 files changed, 31 insertions, 31 deletions
diff --git a/gr-uhd/examples/c++/tag_sink_demo.h b/gr-uhd/examples/c++/tag_sink_demo.h
index 5417bd3242..676005e06c 100644
--- a/gr-uhd/examples/c++/tag_sink_demo.h
+++ b/gr-uhd/examples/c++/tag_sink_demo.h
@@ -47,7 +47,7 @@ public:
         //grab all "rx time" tags in this work call
         const uint64_t samp0_count = this->nitems_read(0);
         std::vector<gr_tag_t> rx_time_tags;
-        get_tags_in_range(rx_time_tags, 0, samp0_count, samp0_count + ninput_items, pmt::pmt_string_to_symbol("rx_time"));
+        get_tags_in_range(rx_time_tags, 0, samp0_count, samp0_count + ninput_items, pmt::string_to_symbol("rx_time"));
 
         //print all tags
         BOOST_FOREACH(const gr_tag_t &rx_time_tag, rx_time_tags){
@@ -55,8 +55,8 @@ public:
             const pmt::pmt_t &value = rx_time_tag.value;
 
             std::cout << boost::format("Full seconds %u, Frac seconds %f, abs sample offset %u")
-                % pmt::pmt_to_uint64(pmt::pmt_tuple_ref(value, 0))
-                % pmt::pmt_to_double(pmt::pmt_tuple_ref(value, 1))
+                % pmt::to_uint64(pmt::tuple_ref(value, 0))
+                % pmt::to_double(pmt::tuple_ref(value, 1))
                 % offset
             << std::endl;
         }
diff --git a/gr-uhd/examples/c++/tag_source_demo.h b/gr-uhd/examples/c++/tag_source_demo.h
index 7d48502b24..6efe4667e5 100644
--- a/gr-uhd/examples/c++/tag_source_demo.h
+++ b/gr-uhd/examples/c++/tag_source_demo.h
@@ -53,26 +53,26 @@ public:
     }
 
     void make_time_tag(const uint64_t tag_count){;
-        const pmt::pmt_t key = pmt::pmt_string_to_symbol("tx_time");
-        const pmt::pmt_t value = pmt::pmt_make_tuple(
-            pmt::pmt_from_uint64(_time_secs),
-            pmt::pmt_from_double(_time_fracs)
+        const pmt::pmt_t key = pmt::string_to_symbol("tx_time");
+        const pmt::pmt_t value = pmt::make_tuple(
+            pmt::from_uint64(_time_secs),
+            pmt::from_double(_time_fracs)
         );
-        const pmt::pmt_t srcid = pmt::pmt_string_to_symbol(this->name());
+        const pmt::pmt_t srcid = pmt::string_to_symbol(this->name());
         this->add_item_tag(0/*chan0*/, tag_count, key, value, srcid);
     }
 
     void make_sob_tag(const uint64_t tag_count){
-        const pmt::pmt_t key = pmt::pmt_string_to_symbol("tx_sob");
+        const pmt::pmt_t key = pmt::string_to_symbol("tx_sob");
         const pmt::pmt_t value = pmt::PMT_T;
-        const pmt::pmt_t srcid = pmt::pmt_string_to_symbol(this->name());
+        const pmt::pmt_t srcid = pmt::string_to_symbol(this->name());
         this->add_item_tag(0/*chan0*/, tag_count, key, value, srcid);
     }
 
     void make_eob_tag(const uint64_t tag_count){;
-        const pmt::pmt_t key = pmt::pmt_string_to_symbol("tx_eob");
+        const pmt::pmt_t key = pmt::string_to_symbol("tx_eob");
         const pmt::pmt_t value = pmt::PMT_T;
-        const pmt::pmt_t srcid = pmt::pmt_string_to_symbol(this->name());
+        const pmt::pmt_t srcid = pmt::string_to_symbol(this->name());
         this->add_item_tag(0/*chan0*/, tag_count, key, value, srcid);
     }
 
diff --git a/gr-uhd/lib/gr_uhd_usrp_sink.cc b/gr-uhd/lib/gr_uhd_usrp_sink.cc
index 6216c94a83..3b8fcea405 100644
--- a/gr-uhd/lib/gr_uhd_usrp_sink.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_sink.cc
@@ -25,9 +25,9 @@
 #include <boost/make_shared.hpp>
 #include "gr_uhd_common.h"
 
-static const pmt::pmt_t SOB_KEY = pmt::pmt_string_to_symbol("tx_sob");
-static const pmt::pmt_t EOB_KEY = pmt::pmt_string_to_symbol("tx_eob");
-static const pmt::pmt_t TIME_KEY = pmt::pmt_string_to_symbol("tx_time");
+static const pmt::pmt_t SOB_KEY = pmt::string_to_symbol("tx_sob");
+static const pmt::pmt_t EOB_KEY = pmt::string_to_symbol("tx_eob");
+static const pmt::pmt_t TIME_KEY = pmt::string_to_symbol("tx_time");
 
 #include <uhd/convert.hpp>
 inline gr_io_signature_sptr args_to_io_sig(const uhd::stream_args_t &args){
@@ -374,23 +374,23 @@ public:
             }
 
             //handle end of burst with a mini end of burst packet
-            else if (pmt::pmt_equal(key, EOB_KEY)){
-                _metadata.end_of_burst = pmt::pmt_to_bool(value);
+            else if (pmt::equal(key, EOB_KEY)){
+                _metadata.end_of_burst = pmt::to_bool(value);
                 ninput_items = 1;
                 return;
             }
 
             //set the start of burst flag in the metadata
-            else if (pmt::pmt_equal(key, SOB_KEY)){
-                _metadata.start_of_burst = pmt::pmt_to_bool(value);
+            else if (pmt::equal(key, SOB_KEY)){
+                _metadata.start_of_burst = pmt::to_bool(value);
             }
 
             //set the time specification in the metadata
-            else if (pmt::pmt_equal(key, TIME_KEY)){
+            else if (pmt::equal(key, TIME_KEY)){
                 _metadata.has_time_spec = true;
                 _metadata.time_spec = uhd::time_spec_t(
-                    pmt::pmt_to_uint64(pmt::pmt_tuple_ref(value, 0)),
-                    pmt::pmt_to_double(pmt::pmt_tuple_ref(value, 1))
+                    pmt::to_uint64(pmt::tuple_ref(value, 0)),
+                    pmt::to_double(pmt::tuple_ref(value, 1))
                 );
             }
         }
diff --git a/gr-uhd/lib/gr_uhd_usrp_source.cc b/gr-uhd/lib/gr_uhd_usrp_source.cc
index 3813673b4b..6403d3d913 100644
--- a/gr-uhd/lib/gr_uhd_usrp_source.cc
+++ b/gr-uhd/lib/gr_uhd_usrp_source.cc
@@ -28,9 +28,9 @@
 #include <boost/make_shared.hpp>
 #include "gr_uhd_common.h"
 
-static const pmt::pmt_t TIME_KEY = pmt::pmt_string_to_symbol("rx_time");
-static const pmt::pmt_t RATE_KEY = pmt::pmt_string_to_symbol("rx_rate");
-static const pmt::pmt_t FREQ_KEY = pmt::pmt_string_to_symbol("rx_freq");
+static const pmt::pmt_t TIME_KEY = pmt::string_to_symbol("rx_time");
+static const pmt::pmt_t RATE_KEY = pmt::string_to_symbol("rx_rate");
+static const pmt::pmt_t FREQ_KEY = pmt::string_to_symbol("rx_freq");
 
 #include <uhd/convert.hpp>
 inline gr_io_signature_sptr args_to_io_sig(const uhd::stream_args_t &args){
@@ -69,7 +69,7 @@ public:
         if (stream_args.cpu_format == "sc16") _type = boost::make_shared<uhd::io_type_t>(uhd::io_type_t::COMPLEX_INT16);
         std::stringstream str;
         str << name() << unique_id();
-        _id = pmt::pmt_string_to_symbol(str.str());
+        _id = pmt::string_to_symbol(str.str());
         _dev = uhd::usrp::multi_usrp::make(device_addr);
     }
 
@@ -363,15 +363,15 @@ public:
             if (_tag_now){
                 _tag_now = false;
                 //create a timestamp pmt for the first sample
-                const pmt::pmt_t val = pmt::pmt_make_tuple(
-                    pmt::pmt_from_uint64(_metadata.time_spec.get_full_secs()),
-                    pmt::pmt_from_double(_metadata.time_spec.get_frac_secs())
+                const pmt::pmt_t val = pmt::make_tuple(
+                    pmt::from_uint64(_metadata.time_spec.get_full_secs()),
+                    pmt::from_double(_metadata.time_spec.get_frac_secs())
                 );
                 //create a tag set for each channel
                 for (size_t i = 0; i < _nchan; i++){
                     this->add_item_tag(i, nitems_written(0), TIME_KEY, val, _id);
-                    this->add_item_tag(i, nitems_written(0), RATE_KEY, pmt::pmt_from_double(_samp_rate), _id);
-                    this->add_item_tag(i, nitems_written(0), FREQ_KEY, pmt::pmt_from_double(_center_freq), _id);
+                    this->add_item_tag(i, nitems_written(0), RATE_KEY, pmt::from_double(_samp_rate), _id);
+                    this->add_item_tag(i, nitems_written(0), FREQ_KEY, pmt::from_double(_center_freq), _id);
                 }
             }
             break;