From 815a7cf32e7436876f14ad4a8f6b0b6e8bbaacf6 Mon Sep 17 00:00:00 2001
From: Tim O'Shea <tim.oshea753@gmail.com>
Date: Fri, 18 Dec 2015 10:02:57 -0800
Subject: blocks: resolve char sign ambiguity causing build breakage with
several gcc versions
---
gr-blocks/lib/add_const_bb_impl.cc | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
(limited to 'gr-blocks/lib/add_const_bb_impl.cc')
diff --git a/gr-blocks/lib/add_const_bb_impl.cc b/gr-blocks/lib/add_const_bb_impl.cc
index e1c808245d..651b9197e3 100644
--- a/gr-blocks/lib/add_const_bb_impl.cc
+++ b/gr-blocks/lib/add_const_bb_impl.cc
@@ -30,16 +30,16 @@
namespace gr {
namespace blocks {
- add_const_bb::sptr add_const_bb::make(char k)
+ add_const_bb::sptr add_const_bb::make(unsigned char k)
{
return gnuradio::get_initial_sptr
(new add_const_bb_impl(k));
}
- add_const_bb_impl::add_const_bb_impl(char k)
+ add_const_bb_impl::add_const_bb_impl(unsigned char k)
: sync_block("add_const_bb",
- io_signature::make (1, 1, sizeof(char)),
- io_signature::make (1, 1, sizeof(char))),
+ io_signature::make (1, 1, sizeof(unsigned char)),
+ io_signature::make (1, 1, sizeof(unsigned char))),
d_k(k)
{
}
@@ -53,8 +53,8 @@ namespace gr {
gr_vector_const_void_star &input_items,
gr_vector_void_star &output_items)
{
- const char *iptr = (const char *) input_items[0];
- char *optr = (char *) output_items[0];
+ const unsigned char *iptr = (const unsigned char *) input_items[0];
+ unsigned char *optr = (unsigned char *) output_items[0];
int size = noutput_items;
@@ -82,7 +82,7 @@ namespace gr {
{
#ifdef GR_CTRLPORT
add_rpc_variable(
- rpcbasic_sptr(new rpcbasic_register_get<add_const_bb, char>(
+ rpcbasic_sptr(new rpcbasic_register_get<add_const_bb, unsigned char>(
alias(), "Constant",
&add_const_bb::k,
pmt::from_long(-128),
@@ -92,7 +92,7 @@ namespace gr {
DISPTIME | DISPOPTCPLX | DISPOPTSTRIP)));
add_rpc_variable(
- rpcbasic_sptr(new rpcbasic_register_set<add_const_bb, char>(
+ rpcbasic_sptr(new rpcbasic_register_set<add_const_bb, unsigned char>(
alias(), "Constant",
&add_const_bb::set_k,
pmt::from_long(-128),
--
cgit v1.2.3