summaryrefslogtreecommitdiff
path: root/include/gnuradio
diff options
context:
space:
mode:
authorJosh Blum2012-09-10 14:12:34 -0700
committerJosh Blum2012-09-10 14:12:34 -0700
commit55289d5761c9fb07019643438e2e0b767ea97ecf (patch)
tree705d72a474f1fb5aec42a21a89ae166071f3d68e /include/gnuradio
parentfc54cf91b4d487ab34d8bc2f67368747c3dc7a07 (diff)
downloadsandhi-55289d5761c9fb07019643438e2e0b767ea97ecf.tar.gz
sandhi-55289d5761c9fb07019643438e2e0b767ea97ecf.tar.bz2
sandhi-55289d5761c9fb07019643438e2e0b767ea97ecf.zip
moved around/tweaking sbuffer code
Diffstat (limited to 'include/gnuradio')
-rw-r--r--include/gnuradio/sbuffer.hpp5
-rw-r--r--include/gnuradio/sbuffer.ipp6
2 files changed, 2 insertions, 9 deletions
diff --git a/include/gnuradio/sbuffer.hpp b/include/gnuradio/sbuffer.hpp
index 25c0b60..c0e13c8 100644
--- a/include/gnuradio/sbuffer.hpp
+++ b/include/gnuradio/sbuffer.hpp
@@ -18,8 +18,6 @@
#define INCLUDED_GNURADIO_SBUFFER_HPP
#include <gnuradio/gras.hpp>
-#include <boost/shared_ptr.hpp>
-#include <boost/weak_ptr.hpp>
#include <boost/function.hpp>
namespace gnuradio
@@ -56,7 +54,8 @@ struct GRAS_API SBufferConfig
};
/*!
- * Buffer is a reference counted smart pointer handler of memory.
+ * SBuffer is a smart/shared reference counted handler of memory.
+ * Thank you boost smart/shared pointers for the disambiguation!
*
* Default allocator:
* To use the default system allocator, set the memory to NULL,
diff --git a/include/gnuradio/sbuffer.ipp b/include/gnuradio/sbuffer.ipp
index 2872386..fa7d0cc 100644
--- a/include/gnuradio/sbuffer.ipp
+++ b/include/gnuradio/sbuffer.ipp
@@ -67,12 +67,6 @@ inline void intrusive_ptr_release(SBufferImpl *impl)
}
}
-inline SBufferConfig::SBufferConfig(void)
-{
- memory = NULL;
- length = 0;
-}
-
inline void *SBuffer::get_actual_memory(void) const
{
return (*this)->config.memory;