uhd: change bounded_buffer implementation and code using it

The bounded buffer now uses the detail idiom to hide implementation to inline better.
The whole sptr/make idiom was removed from bounded buffer to just construct directly.
The code using bounded buffer was changed for the new api:
replaces access operators and calls to the factory function.

1 files changed, 18 insertions, 18 deletions

diff --git a/host/tests/buffer_test.cpp b/host/tests/buffer_test.cpp
index e7bc88699..23b52a9bf 100644
--- a/host/tests/buffer_test.cpp
+++ b/host/tests/buffer_test.cpp
@@ -1,5 +1,5 @@
 //
-// Copyright 2010 Ettus Research LLC
+// Copyright 2010-2011 Ettus Research LLC
 //
 // This program is free software: you can redistribute it and/or modify
 // it under the terms of the GNU General Public License as published by
@@ -25,40 +25,40 @@ using namespace uhd::transport;
 static const double timeout = 0.01/*secs*/;
 
 BOOST_AUTO_TEST_CASE(test_bounded_buffer_with_timed_wait){
-    bounded_buffer<int>::sptr bb(bounded_buffer<int>::make(3));
+    bounded_buffer<int> bb(3);
 
     //push elements, check for timeout
-    BOOST_CHECK(bb->push_with_timed_wait(0, timeout));
-    BOOST_CHECK(bb->push_with_timed_wait(1, timeout));
-    BOOST_CHECK(bb->push_with_timed_wait(2, timeout));
-    BOOST_CHECK(not bb->push_with_timed_wait(3, timeout));
+    BOOST_CHECK(bb.push_with_timed_wait(0, timeout));
+    BOOST_CHECK(bb.push_with_timed_wait(1, timeout));
+    BOOST_CHECK(bb.push_with_timed_wait(2, timeout));
+    BOOST_CHECK(not bb.push_with_timed_wait(3, timeout));
 
     int val;
     //pop elements, check for timeout and check values
-    BOOST_CHECK(bb->pop_with_timed_wait(val, timeout));
+    BOOST_CHECK(bb.pop_with_timed_wait(val, timeout));
     BOOST_CHECK_EQUAL(val, 0);
-    BOOST_CHECK(bb->pop_with_timed_wait(val, timeout));
+    BOOST_CHECK(bb.pop_with_timed_wait(val, timeout));
     BOOST_CHECK_EQUAL(val, 1);
-    BOOST_CHECK(bb->pop_with_timed_wait(val, timeout));
+    BOOST_CHECK(bb.pop_with_timed_wait(val, timeout));
     BOOST_CHECK_EQUAL(val, 2);
-    BOOST_CHECK(not bb->pop_with_timed_wait(val, timeout));
+    BOOST_CHECK(not bb.pop_with_timed_wait(val, timeout));
 }
 
 BOOST_AUTO_TEST_CASE(test_bounded_buffer_with_pop_on_full){
-    bounded_buffer<int>::sptr bb(bounded_buffer<int>::make(3));
+    bounded_buffer<int> bb(3);
 
     //push elements, check for timeout
-    BOOST_CHECK(bb->push_with_pop_on_full(0));
-    BOOST_CHECK(bb->push_with_pop_on_full(1));
-    BOOST_CHECK(bb->push_with_pop_on_full(2));
-    BOOST_CHECK(not bb->push_with_pop_on_full(3));
+    BOOST_CHECK(bb.push_with_pop_on_full(0));
+    BOOST_CHECK(bb.push_with_pop_on_full(1));
+    BOOST_CHECK(bb.push_with_pop_on_full(2));
+    BOOST_CHECK(not bb.push_with_pop_on_full(3));
 
     int val;
     //pop elements, check for timeout and check values
-    BOOST_CHECK(bb->pop_with_timed_wait(val, timeout));
+    BOOST_CHECK(bb.pop_with_timed_wait(val, timeout));
     BOOST_CHECK_EQUAL(val, 1);
-    BOOST_CHECK(bb->pop_with_timed_wait(val, timeout));
+    BOOST_CHECK(bb.pop_with_timed_wait(val, timeout));
     BOOST_CHECK_EQUAL(val, 2);
-    BOOST_CHECK(bb->pop_with_timed_wait(val, timeout));
+    BOOST_CHECK(bb.pop_with_timed_wait(val, timeout));
     BOOST_CHECK_EQUAL(val, 3);
 }