diff options
| author | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-21 15:36:44 -0800 |
|---|---|---|
| committer | Johnathan Corgan <johnathan@corganlabs.com> | 2013-02-21 15:36:44 -0800 |
| commit | 93af8e3734a44d3b43e5c25570c457b151977ae5 (patch) | |
| tree | 9cdc2373e44b780c86ed9a646433e1defb228cda /gnuradio-core/src/lib | |
| parent | e7fca2fa9ddaa5468374c1f664a0ddc7043709db (diff) | |
| parent | e7e219cde48347fbaf8849fcb820212893272a2e (diff) | |
Merge branch 'master' into next
Conflicts:
gnuradio-core/src/lib/general/gr_random_pdu.cc
volk/apps/volk_profile.cc
Diffstat (limited to 'gnuradio-core/src/lib')
| -rw-r--r-- | gnuradio-core/src/lib/general/gr_random_pdu.cc | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/gnuradio-core/src/lib/general/gr_random_pdu.cc b/gnuradio-core/src/lib/general/gr_random_pdu.cc index 61332c0715..746f8944a2 100644 --- a/gnuradio-core/src/lib/general/gr_random_pdu.cc +++ b/gnuradio-core/src/lib/general/gr_random_pdu.cc @@ -34,6 +34,7 @@ #include <stdexcept> #include <string.h> #include <iostream> +#include <vector> // public constructor that returns a shared_ptr @@ -68,14 +69,15 @@ void gr_random_pdu::output_random(){ int len = rvar(); // fill it with random bytes - unsigned char vec[len]; + std::vector<unsigned char> vec; for(int i=0; i<len; i++){ - vec[i] = (unsigned char) bvar(); + vec.push_back((unsigned char) bvar()); } // send the vector - pmt::pmt_t vecpmt( pmt::make_blob( vec, len ) ); + pmt::pmt_t vecpmt( pmt::make_blob( &vec[0], len ) ); pmt::pmt_t pdu( pmt::cons( pmt::PMT_NIL, vecpmt ) ); + message_port_pub( pmt::mp("pdus"), pdu ); std::cout << "sending new random vector of length " << len << "\n"; |