diff options
Diffstat (limited to 'gnuradio-runtime/lib/pmt')
-rw-r--r-- | gnuradio-runtime/lib/pmt/CMakeLists.txt | 4 | ||||
-rw-r--r-- | gnuradio-runtime/lib/pmt/pmt.cc | 2 | ||||
-rw-r--r-- | gnuradio-runtime/lib/pmt/pmt_serialize.cc | 8 | ||||
-rw-r--r-- | gnuradio-runtime/lib/pmt/qa_pmt_prims.cc | 4 | ||||
-rw-r--r-- | gnuradio-runtime/lib/pmt/unv_template.cc.t | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/gnuradio-runtime/lib/pmt/CMakeLists.txt b/gnuradio-runtime/lib/pmt/CMakeLists.txt index 193ccbe62f..dc4fe1be46 100644 --- a/gnuradio-runtime/lib/pmt/CMakeLists.txt +++ b/gnuradio-runtime/lib/pmt/CMakeLists.txt @@ -86,7 +86,7 @@ list(APPEND gnuradio_pmt_libs ${LOG4CPP_LIBRARIES} ) -add_custom_target(pmt_generated +add_custom_target(pmt_generated DEPENDS ${PMT_SERIAL_TAGS_H} ${CMAKE_CURRENT_BINARY_DIR}/pmt_unv_int.h) @@ -133,7 +133,7 @@ include_directories(${CPPUNIT_INCLUDE_DIRS}) link_directories(${CPPUNIT_LIBRARY_DIRS}) add_library(test-gnuradio-pmt SHARED ${test_gnuradio_pmt_sources}) -target_link_libraries(test-gnuradio-pmt gnuradio-runtime gnuradio-pmt +target_link_libraries(test-gnuradio-pmt gnuradio-runtime gnuradio-pmt ${CPPUNIT_LIBRARIES} ${Boost_LIBRARIES} ${LOG4CPP_LIBRARIES}) ######################################################################## diff --git a/gnuradio-runtime/lib/pmt/pmt.cc b/gnuradio-runtime/lib/pmt/pmt.cc index 8315100ab3..e3b93255bc 100644 --- a/gnuradio-runtime/lib/pmt/pmt.cc +++ b/gnuradio-runtime/lib/pmt/pmt.cc @@ -1388,7 +1388,7 @@ list_has(pmt_t list, const pmt_t& item) pmt_t right = cdr(list); if(equal(left,item)) return true; - return list_has(right, item); + return list_has(right, item); } else { if(is_null(list)) return false; diff --git a/gnuradio-runtime/lib/pmt/pmt_serialize.cc b/gnuradio-runtime/lib/pmt/pmt_serialize.cc index fc5763aed4..5cc2005ca7 100644 --- a/gnuradio-runtime/lib/pmt/pmt_serialize.cc +++ b/gnuradio-runtime/lib/pmt/pmt_serialize.cc @@ -276,14 +276,14 @@ serialize(pmt_t obj, std::streambuf &sb) } if(is_number(obj)) { - + if(is_uint64(obj)) { uint64_t i = to_uint64(obj); ok = serialize_untagged_u8(PST_UINT64, sb); ok &= serialize_untagged_u64(i, sb); return ok; } - else { + else { if(is_integer(obj)) { long i = to_long(obj); if(sizeof(long) > 4) { @@ -581,7 +581,7 @@ deserialize(std::streambuf &sb) goto error; return make_rectangular( r,i ); } - + case PST_TUPLE: { pmt_t tuple; @@ -614,7 +614,7 @@ deserialize(std::streambuf &sb) if(!deserialize_untagged_u32(&nitems, sb)) goto error; - + deserialize_untagged_u8(&npad, sb); for(size_t i = 0; i < npad; i++) deserialize_untagged_u8(&u8, sb); diff --git a/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc b/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc index bfe71fbe5a..2f46b014db 100644 --- a/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc +++ b/gnuradio-runtime/lib/pmt/qa_pmt_prims.cc @@ -478,7 +478,7 @@ qa_pmt_prims::test_any() // ------------------------------------------------------------------------ -class qa_pmt_msg_accepter_nop : public gr::messages::msg_accepter +class qa_pmt_msg_accepter_nop : public gr::messages::msg_accepter { public: qa_pmt_msg_accepter_nop(){}; @@ -496,7 +496,7 @@ qa_pmt_prims::test_msg_accepter() boost::any a0; a0 = std::string("Hello!"); pmt::pmt_t p0 = pmt::make_any(a0); - + gr::messages::msg_accepter_sptr ma0 = \ gr::messages::msg_accepter_sptr(new qa_pmt_msg_accepter_nop()); pmt::pmt_t p1 = pmt::make_msg_accepter(ma0); diff --git a/gnuradio-runtime/lib/pmt/unv_template.cc.t b/gnuradio-runtime/lib/pmt/unv_template.cc.t index 8678894973..0342367f7e 100644 --- a/gnuradio-runtime/lib/pmt/unv_template.cc.t +++ b/gnuradio-runtime/lib/pmt/unv_template.cc.t @@ -90,7 +90,7 @@ init_@TAG@vector(size_t k, const @TYPE@ *data) pmt_t init_@TAG@vector(size_t k, const std::vector< @TYPE@ > &data) { - + return pmt_t(new pmt_@TAG@vector(k, &data[0])); } |