diff options
| -rw-r--r-- | lib/block_handlers.cpp | 2 | ||||
| -rw-r--r-- | lib/element_impl.hpp | 16 | ||||
| -rw-r--r-- | lib/gras_impl/debug.hpp (renamed from lib/debug_impl.hpp) | 6 | ||||
| -rw-r--r-- | lib/gras_impl/input_buffer_queues.hpp (renamed from lib/buffer_ios.hpp) | 10 | ||||
| -rw-r--r-- | lib/gras_impl/misc.hpp (renamed from lib/common_impl.hpp) | 6 | ||||
| -rw-r--r-- | lib/gras_impl/vector_of_queues.hpp (renamed from lib/vector_of_queues.hpp) | 6 | ||||
| -rw-r--r-- | lib/gras_impl/vector_utils.hpp (renamed from lib/vec_utils_impl.hpp) | 6 | ||||
| -rw-r--r-- | lib/hier_block.cpp | 2 |
8 files changed, 27 insertions, 27 deletions
diff --git a/lib/block_handlers.cpp b/lib/block_handlers.cpp index 4e6b732..07237a8 100644 --- a/lib/block_handlers.cpp +++ b/lib/block_handlers.cpp @@ -15,7 +15,7 @@ // along with io_sig program. If not, see <http://www.gnu.org/licenses/>. #include "element_impl.hpp" -#include "vec_utils_impl.hpp" +#include <gras_impl/vector_utils.hpp> using namespace gnuradio; diff --git a/lib/element_impl.hpp b/lib/element_impl.hpp index 9cd21f6..5d6d07c 100644 --- a/lib/element_impl.hpp +++ b/lib/element_impl.hpp @@ -14,13 +14,13 @@ // You should have received a copy of the GNU Lesser General Public License // along with io_sig program. If not, see <http://www.gnu.org/licenses/>. -#ifndef INCLUDED_LIBGNURADIO_ELEMENT_IMPL_HPP -#define INCLUDED_LIBGNURADIO_ELEMENT_IMPL_HPP +#ifndef INCLUDED_LIBGRAS_ELEMENT_IMPL_HPP +#define INCLUDED_LIBGRAS_ELEMENT_IMPL_HPP -#include <debug_impl.hpp> -#include <common_impl.hpp> -#include <vector_of_queues.hpp> -#include <buffer_ios.hpp> +#include <gras_impl/debug.hpp> +#include <gras_impl/misc.hpp> +#include <gras_impl/vector_of_queues.hpp> +#include <gras_impl/input_buffer_queues.hpp> #include <tsbe/block.hpp> #include <tsbe/topology.hpp> @@ -81,7 +81,7 @@ struct ElementImpl std::vector<tsbe::BufferToken> output_buffer_tokens; //buffer queues and ready conditions - BufferIOs input_queues; + InputBufferQueues input_queues; VectorOfQueues<tsbe::Buffer> output_queues; //tag tracking @@ -130,4 +130,4 @@ struct ElementImpl } //namespace gnuradio -#endif /*INCLUDED_LIBGNURADIO_ELEMENT_IMPL_HPP*/ +#endif /*INCLUDED_LIBGRAS_ELEMENT_IMPL_HPP*/ diff --git a/lib/debug_impl.hpp b/lib/gras_impl/debug.hpp index 80c01c7..ea0d7bf 100644 --- a/lib/debug_impl.hpp +++ b/lib/gras_impl/debug.hpp @@ -14,8 +14,8 @@ // You should have received a copy of the GNU Lesser General Public License // along with io_sig program. If not, see <http://www.gnu.org/licenses/>. -#ifndef INCLUDED_LIBGRAS_DEBUG_IMPL_HPP -#define INCLUDED_LIBGRAS_DEBUG_IMPL_HPP +#ifndef INCLUDED_LIBGRAS_IMPL_DEBUG_HPP +#define INCLUDED_LIBGRAS_IMPL_DEBUG_HPP #include <iostream> @@ -23,4 +23,4 @@ #define VAR(x) std::cerr << #x << " = " << (x) << std::endl << std::flush; #define ASSERT(x) if(not (x)){std::cerr << "ASSERT FAIL " << __FILE__ << ":" << __LINE__ << "\n\t" << #x << std::endl << std::flush;} -#endif /*INCLUDED_LIBGRAS_DEBUG_IMPL_HPP*/ +#endif /*INCLUDED_LIBGRAS_IMPL_DEBUG_HPP*/ diff --git a/lib/buffer_ios.hpp b/lib/gras_impl/input_buffer_queues.hpp index 2a74ba7..6ac786f 100644 --- a/lib/buffer_ios.hpp +++ b/lib/gras_impl/input_buffer_queues.hpp @@ -14,10 +14,10 @@ // You should have received a copy of the GNU Lesser General Public License // along with io_sig program. If not, see <http://www.gnu.org/licenses/>. -#ifndef INCLUDED_LIBGRAS_BUFFER_IOS_HPP -#define INCLUDED_LIBGRAS_BUFFER_IOS_HPP +#ifndef INCLUDED_LIBGRAS_IMPL_INPUT_BUFFERS_HPP +#define INCLUDED_LIBGRAS_IMPL_INPUT_BUFFERS_HPP -#include <debug_impl.hpp> +#include <gras_impl/debug.hpp> #include <tsbe/buffer.hpp> #include <boost/dynamic_bitset.hpp> #include <vector> @@ -33,7 +33,7 @@ struct BuffInfo size_t len; }; -struct BufferIOs +struct InputBufferQueues { boost::dynamic_bitset<> _bitset; std::vector<std::queue<tsbe::Buffer> > _queues; @@ -198,4 +198,4 @@ struct BufferIOs } //namespace gnuradio -#endif /*INCLUDED_LIBGRAS_BUFFER_IOS_HPP*/ +#endif /*INCLUDED_LIBGRAS_IMPL_INPUT_BUFFERS_HPP*/ diff --git a/lib/common_impl.hpp b/lib/gras_impl/misc.hpp index 40d9676..e988480 100644 --- a/lib/common_impl.hpp +++ b/lib/gras_impl/misc.hpp @@ -14,8 +14,8 @@ // You should have received a copy of the GNU Lesser General Public License // along with io_sig program. If not, see <http://www.gnu.org/licenses/>. -#ifndef INCLUDED_LIBGNURADIO_COMMON_IMPL_HPP -#define INCLUDED_LIBGNURADIO_COMMON_IMPL_HPP +#ifndef INCLUDED_LIBGRAS_IMPL_MISC_HPP +#define INCLUDED_LIBGRAS_IMPL_MISC_HPP #include <tsbe/buffer.hpp> #include <boost/shared_ptr.hpp> @@ -76,4 +76,4 @@ struct BufferReturnMessage } //namespace gnuradio -#endif /*INCLUDED_LIBGNURADIO_COMMON_IMPL_HPP*/ +#endif /*INCLUDED_LIBGRAS_IMPL_MISC_HPP*/ diff --git a/lib/vector_of_queues.hpp b/lib/gras_impl/vector_of_queues.hpp index 5427bf7..32e0b7f 100644 --- a/lib/vector_of_queues.hpp +++ b/lib/gras_impl/vector_of_queues.hpp @@ -14,8 +14,8 @@ // You should have received a copy of the GNU Lesser General Public License // along with io_sig program. If not, see <http://www.gnu.org/licenses/>. -#ifndef INCLUDED_LIBGNURADIO_VECTOR_OF_QUEUES_HPP -#define INCLUDED_LIBGNURADIO_VECTOR_OF_QUEUES_HPP +#ifndef INCLUDED_LIBGRAS_IMPL_VECTOR_OF_QUEUES_HPP +#define INCLUDED_LIBGRAS_IMPL_VECTOR_OF_QUEUES_HPP #include <boost/dynamic_bitset.hpp> #include <vector> @@ -89,4 +89,4 @@ struct VectorOfQueues } //namespace gnuradio -#endif /*INCLUDED_LIBGNURADIO_VECTOR_OF_QUEUES_HPP*/ +#endif /*INCLUDED_LIBGRAS_IMPL_VECTOR_OF_QUEUES_HPP*/ diff --git a/lib/vec_utils_impl.hpp b/lib/gras_impl/vector_utils.hpp index 779d368..ca393d4 100644 --- a/lib/vec_utils_impl.hpp +++ b/lib/gras_impl/vector_utils.hpp @@ -14,8 +14,8 @@ // You should have received a copy of the GNU Lesser General Public License // along with io_sig program. If not, see <http://www.gnu.org/licenses/>. -#ifndef INCLUDED_LIBGNURADIO_VEC_UTILS_HPP_HPP -#define INCLUDED_LIBGNURADIO_VEC_UTILS_HPP_HPP +#ifndef INCLUDED_LIBGRAS_IMPL_VECTOR_UTILS_HPP +#define INCLUDED_LIBGRAS_IMPL_VECTOR_UTILS_HPP //! return true if an instance was found and removed template <typename V, typename T> @@ -56,4 +56,4 @@ void fill_item_sizes_from_sig(V &v, const Sig &s, const size_t size) } } -#endif /*INCLUDED_LIBGNURADIO_VEC_UTILS_HPP_HPP*/ +#endif /*INCLUDED_LIBGRAS_IMPL_VECTOR_UTILS_HPP*/ diff --git a/lib/hier_block.cpp b/lib/hier_block.cpp index 3603612..d36608f 100644 --- a/lib/hier_block.cpp +++ b/lib/hier_block.cpp @@ -15,7 +15,7 @@ // along with io_sig program. If not, see <http://www.gnu.org/licenses/>. #include "element_impl.hpp" -#include "vec_utils_impl.hpp" +#include <gras_impl/vector_utils.hpp> #include <gnuradio/hier_block.hpp> using namespace gnuradio; |