diff options
Diffstat (limited to 'host/tests/property_test.cpp')
-rw-r--r-- | host/tests/property_test.cpp | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/host/tests/property_test.cpp b/host/tests/property_test.cpp index 732e3ca84..ac5d489ae 100644 --- a/host/tests/property_test.cpp +++ b/host/tests/property_test.cpp @@ -7,11 +7,12 @@ // #include <uhd/property_tree.hpp> -#include <boost/bind.hpp> #include <boost/test/unit_test.hpp> #include <exception> +#include <functional> #include <iostream> + struct coercer_type { int doit(int x) @@ -69,7 +70,7 @@ BOOST_AUTO_TEST_CASE(test_prop_with_desired_subscriber) uhd::property<int>& prop = tree->create<int>("/"); setter_type setter; - prop.add_desired_subscriber(boost::bind(&setter_type::doit, &setter, _1)); + prop.add_desired_subscriber(std::bind(&setter_type::doit, &setter, std::placeholders::_1)); prop.set(42); BOOST_CHECK_EQUAL(prop.get_desired(), 42); @@ -88,7 +89,7 @@ BOOST_AUTO_TEST_CASE(test_prop_with_coerced_subscriber) uhd::property<int>& prop = tree->create<int>("/"); setter_type setter; - prop.add_coerced_subscriber(boost::bind(&setter_type::doit, &setter, _1)); + prop.add_coerced_subscriber(std::bind(&setter_type::doit, &setter, std::placeholders::_1)); prop.set(42); BOOST_CHECK_EQUAL(prop.get_desired(), 42); @@ -107,8 +108,8 @@ BOOST_AUTO_TEST_CASE(test_prop_manual_coercion) uhd::property<int>& prop = tree->create<int>("/", uhd::property_tree::MANUAL_COERCE); setter_type dsetter, csetter; - prop.add_desired_subscriber(boost::bind(&setter_type::doit, &dsetter, _1)); - prop.add_coerced_subscriber(boost::bind(&setter_type::doit, &csetter, _1)); + prop.add_desired_subscriber(std::bind(&setter_type::doit, &dsetter, std::placeholders::_1)); + prop.add_coerced_subscriber(std::bind(&setter_type::doit, &csetter, std::placeholders::_1)); BOOST_CHECK_EQUAL(dsetter._x, 0); BOOST_CHECK_EQUAL(csetter._x, 0); @@ -132,7 +133,7 @@ BOOST_AUTO_TEST_CASE(test_prop_with_publisher) BOOST_CHECK(prop.empty()); getter_type getter; - prop.set_publisher(boost::bind(&getter_type::doit, &getter)); + prop.set_publisher(std::bind(&getter_type::doit, &getter)); BOOST_CHECK(not prop.empty()); getter._x = 42; @@ -150,10 +151,10 @@ BOOST_AUTO_TEST_CASE(test_prop_with_publisher_and_subscriber) uhd::property<int>& prop = tree->create<int>("/"); getter_type getter; - prop.set_publisher(boost::bind(&getter_type::doit, &getter)); + prop.set_publisher(std::bind(&getter_type::doit, &getter)); setter_type setter; - prop.add_coerced_subscriber(boost::bind(&setter_type::doit, &setter, _1)); + prop.add_coerced_subscriber(std::bind(&setter_type::doit, &setter, std::placeholders::_1)); getter._x = 42; prop.set(0); @@ -172,10 +173,10 @@ BOOST_AUTO_TEST_CASE(test_prop_with_coercion) uhd::property<int>& prop = tree->create<int>("/"); setter_type setter; - prop.add_coerced_subscriber(boost::bind(&setter_type::doit, &setter, _1)); + prop.add_coerced_subscriber(std::bind(&setter_type::doit, &setter, std::placeholders::_1)); coercer_type coercer; - prop.set_coercer(boost::bind(&coercer_type::doit, &coercer, _1)); + prop.set_coercer(std::bind(&coercer_type::doit, &coercer, std::placeholders::_1)); prop.set(42); BOOST_CHECK_EQUAL(prop.get(), 40); |