Merge branch 'master' into next

This commit is contained in:
Bastian Bloessl
2018-06-21 10:05:20 +01:00
8 changed files with 26 additions and 26 deletions
+3 -3
View File
@@ -28,14 +28,14 @@ class FOO_API periodic_msg_source : virtual public gr::block
public:
typedef boost::shared_ptr<periodic_msg_source> sptr;
static sptr make(pmt::pmt_t msg, float interval, int num_msg = -1,
static sptr make(pmt::pmt_t msg, long interval, int num_msg = -1,
bool quit = true, bool debug = false);
virtual void set_nmsg(int nmsg) = 0;
virtual int get_nmsg() = 0;
virtual void set_delay(float delay) = 0;
virtual float get_delay() = 0;
virtual void set_delay(long delay) = 0;
virtual long get_delay() = 0;
virtual void start_tx() = 0;
virtual void stop_tx() = 0;
+3 -3
View File
@@ -29,14 +29,14 @@ class FOO_API random_periodic_msg_source : virtual public gr::block
public:
typedef boost::shared_ptr<random_periodic_msg_source> sptr;
static sptr make(int msg_len, float interval, int num_msg = 1,
static sptr make(int msg_len, long interval, int num_msg = 1,
bool quit = true, bool debug = false, int seed = 0);
virtual void set_nmsg(int nmsg) = 0;
virtual int get_nmsg() = 0;
virtual void set_delay(float delay) = 0;
virtual float get_delay() = 0;
virtual void set_delay(long delay) = 0;
virtual long get_delay() = 0;
virtual void start_tx() = 0;
virtual void stop_tx() = 0;