diff options
| author | Josh Blum | 2012-10-05 01:32:45 -0700 |
|---|---|---|
| committer | Josh Blum | 2012-10-05 01:32:45 -0700 |
| commit | e5f49c3b50b96c0ededfe6ba40be0ed8a28185ce (patch) | |
| tree | 8b5ebd175078aa847b889d32be376c90b97aff6b | |
| parent | 9b06c037fcb618199e99518ee120ef3b2f1e96a7 (diff) | |
| download | sandhi-e5f49c3b50b96c0ededfe6ba40be0ed8a28185ce.tar.gz sandhi-e5f49c3b50b96c0ededfe6ba40be0ed8a28185ce.tar.bz2 sandhi-e5f49c3b50b96c0ededfe6ba40be0ed8a28185ce.zip | |
moved include junk into respective headers
| -rw-r--r-- | include/gnuradio/element.hpp | 3 | ||||
| -rw-r--r-- | include/gnuradio/gras.hpp | 17 | ||||
| -rw-r--r-- | include/gnuradio/sbuffer.hpp | 6 | ||||
| -rw-r--r-- | include/gnuradio/thread_pool.hpp | 2 |
4 files changed, 12 insertions, 16 deletions
diff --git a/include/gnuradio/element.hpp b/include/gnuradio/element.hpp index f009862..72927ca 100644 --- a/include/gnuradio/element.hpp +++ b/include/gnuradio/element.hpp @@ -19,12 +19,15 @@ #include <gnuradio/gras.hpp> #include <gnuradio/io_signature.hpp> +#include <boost/shared_ptr.hpp> #include <boost/enable_shared_from_this.hpp> #include <gruel/pmt.h> namespace gnuradio { +class ElementImpl; + struct GRAS_API Element : boost::shared_ptr<ElementImpl>, boost::enable_shared_from_this<Element> { diff --git a/include/gnuradio/gras.hpp b/include/gnuradio/gras.hpp index 1759be1..1712ed4 100644 --- a/include/gnuradio/gras.hpp +++ b/include/gnuradio/gras.hpp @@ -17,9 +17,7 @@ #ifndef INCLUDED_GNURADIO_GRAS_HPP #define INCLUDED_GNURADIO_GRAS_HPP -#include <boost/shared_ptr.hpp> -#include <boost/weak_ptr.hpp> -#include <boost/intrusive_ptr.hpp> +#include <ciso646> //this is part of core for now, treat it as such #include <gr_core_api.h> @@ -38,17 +36,4 @@ #define GRAS_FORCE_INLINE inline #endif -namespace gnuradio -{ - -struct ElementImpl; - -struct SBuffer; -struct SBufferImpl; - -void intrusive_ptr_add_ref(SBufferImpl*); -void intrusive_ptr_release(SBufferImpl*); - -} //namespace gnuradio - #endif /*INCLUDED_GNURADIO_GRAS_HPP*/ diff --git a/include/gnuradio/sbuffer.hpp b/include/gnuradio/sbuffer.hpp index 89ce10b..6398991 100644 --- a/include/gnuradio/sbuffer.hpp +++ b/include/gnuradio/sbuffer.hpp @@ -18,11 +18,17 @@ #define INCLUDED_GNURADIO_SBUFFER_HPP #include <gnuradio/gras.hpp> +#include <boost/shared_ptr.hpp> +#include <boost/weak_ptr.hpp> +#include <boost/intrusive_ptr.hpp> #include <boost/function.hpp> namespace gnuradio { +struct SBufferImpl; +struct SBuffer; + //! The callback function type when buffers dereference typedef boost::function<void(SBuffer &)> SBufferDeleter; diff --git a/include/gnuradio/thread_pool.hpp b/include/gnuradio/thread_pool.hpp index 42b4208..c0adc1c 100644 --- a/include/gnuradio/thread_pool.hpp +++ b/include/gnuradio/thread_pool.hpp @@ -18,6 +18,8 @@ #define INCLUDED_GNURADIO_THREAD_POOL_HPP #include <gnuradio/gras.hpp> +#include <boost/shared_ptr.hpp> +#include <boost/weak_ptr.hpp> //! ThreadPool is an unexposed Theron Framework //! Forward declare the Framwork for c++ users |