Replaced uses of wax:cast with the templated as method (like in boost program options).

2 files changed, 14 insertions, 13 deletions

diff --git a/host/test/gain_handler_test.cpp b/host/test/gain_handler_test.cpp
index 51497b741..a4005c0de 100644
--- a/host/test/gain_handler_test.cpp
+++ b/host/test/gain_handler_test.cpp
@@ -59,7 +59,7 @@ private:
         boost::tie(key, name) = extract_named_prop(key_);
 
         //handle the get request conditioned on the key
-        switch(wax::cast<prop_t>(key)){
+        switch(key.as<prop_t>()){
         case PROP_GAIN_VALUE:
             val = _gain_values[name];
             return;
@@ -81,9 +81,9 @@ private:
         boost::tie(key, name) = extract_named_prop(key_);
 
         //handle the get request conditioned on the key
-        switch(wax::cast<prop_t>(key)){
+        switch(key.as<prop_t>()){
         case PROP_GAIN_VALUE:
-            _gain_values[name] = wax::cast<gain_t>(val);
+            _gain_values[name] = val.as<gain_t>();
             return;
 
         case PROP_GAIN_RANGE:
@@ -103,14 +103,14 @@ BOOST_AUTO_TEST_CASE(test_gain_handler){
     gainful_obj go0;
 
     BOOST_CHECK_THROW(
-        wax::cast<gain_t>(go0[named_prop_t(PROP_GAIN_VALUE, "fail")]),
+        go0[named_prop_t(PROP_GAIN_VALUE, "fail")].as<gain_t>(),
         std::exception
     );
 
     std::cout << "verifying the overall min, max, step" << std::endl;
     gain_t gain_min, gain_max, gain_step;
     boost::tie(gain_min, gain_max, gain_step) = \
-        wax::cast<gain_range_t>(go0[PROP_GAIN_RANGE]);
+        go0[PROP_GAIN_RANGE].as<gain_range_t>();
     BOOST_CHECK_EQUAL(gain_min, gain_t(-10));
     BOOST_CHECK_EQUAL(gain_max, gain_t(100));
     BOOST_CHECK_EQUAL(gain_step, gain_t(1.5));
@@ -118,5 +118,5 @@ BOOST_AUTO_TEST_CASE(test_gain_handler){
     std::cout << "verifying the overall gain" << std::endl;
     go0[named_prop_t(PROP_GAIN_VALUE, "g0")] = gain_t(-5);
     go0[named_prop_t(PROP_GAIN_VALUE, "g1")] = gain_t(30);
-    BOOST_CHECK_EQUAL(wax::cast<gain_t>(go0[PROP_GAIN_VALUE]), gain_t(25));
+    BOOST_CHECK_EQUAL(go0[PROP_GAIN_VALUE].as<gain_t>(), gain_t(25));
 }
diff --git a/host/test/wax_test.cpp b/host/test/wax_test.cpp
index e5e1adc25..b793b2690 100644
--- a/host/test/wax_test.cpp
+++ b/host/test/wax_test.cpp
@@ -17,14 +17,15 @@
 
 #include <boost/test/unit_test.hpp>
 #include <uhd/wax.hpp>
+#include <iostream>
 
 enum opt_a_t{OPTION_A_0, OPTION_A_1};
 enum opt_b_t{OPTION_B_0, OPTION_B_1};
 
 BOOST_AUTO_TEST_CASE(test_enums){
     wax::obj opta = OPTION_A_0;
-    BOOST_CHECK_THROW(wax::cast<opt_b_t>(opta), wax::bad_cast);
-    BOOST_CHECK_EQUAL(wax::cast<opt_a_t>(opta), OPTION_A_0);
+    BOOST_CHECK_THROW(opta.as<opt_b_t>(), wax::bad_cast);
+    BOOST_CHECK_EQUAL(opta.as<opt_a_t>(), OPTION_A_0);
 }
 
 /***********************************************************************
@@ -48,14 +49,14 @@ public:
     }
     void get(const wax::obj &key, wax::obj &value){
         if (d_subs.size() == 0){
-            value = d_nums[wax::cast<size_t>(key)];
+            value = d_nums[key.as<size_t>()];
         }else{
-            value = d_subs[wax::cast<size_t>(key)].get_link();
+            value = d_subs[key.as<size_t>()].get_link();
         }
     }
     void set(const wax::obj &key, const wax::obj &value){
         if (d_subs.size() == 0){
-            d_nums[wax::cast<size_t>(key)] = wax::cast<float>(value);
+            d_nums[key.as<size_t>()] = value.as<float>();
         }else{
             throw std::runtime_error("cant set to a wax demo with sub demos");
         }
@@ -81,7 +82,7 @@ BOOST_AUTO_TEST_CASE(test_set_get){
                 float val = i * j * k + i + j + k;
                 //std::cout << i << " " << j << " " << k << std::endl;
                 wd[i][j][k] = val;
-                BOOST_CHECK_EQUAL(val, wax::cast<float>(wd[i][j][k]));
+                BOOST_CHECK_EQUAL(val, wd[i][j][k].as<float>());
             }
         }
     }
@@ -94,5 +95,5 @@ BOOST_AUTO_TEST_CASE(test_proxy){
 
     std::cout << "assign proxy" << std::endl;
     wax::obj a = p[size_t(0)];
-    BOOST_CHECK_EQUAL(wax::cast<float>(a), float(5));
+    BOOST_CHECK_EQUAL(a.as<float>(), float(5));
 }