Merge commit 'v3.3.0' into upstream

[debian/gnuradio] / gnuradio-core / src / lib / io / gr_message_source.h

diff --git a/gnuradio-core/src/lib/io/gr_message_source.h b/gnuradio-core/src/lib/io/gr_message_source.h
index 4a1378c2b2a67f3c2d15d244fb515bf011458b29..46a808754c0f9830b551b0c43f4e97241f525fba 100644 (file)
--- a/gnuradio-core/src/lib/io/gr_message_source.h
+++ b/gnuradio-core/src/lib/io/gr_message_source.h
@@ -31,10 +31,11 @@ class gr_message_source;
 typedef boost::shared_ptr<gr_message_source> gr_message_source_sptr;
 
 gr_message_source_sptr gr_make_message_source (size_t itemsize, int msgq_limit=0);
+gr_message_source_sptr gr_make_message_source (size_t itemsize, gr_msg_queue_sptr msgq);
 
 /*!
  * \brief Turn received messages into a stream
- * \ingroup source
+ * \ingroup source_blk
  */
 class gr_message_source : public gr_sync_block
 {
@@ -47,9 +48,12 @@ class gr_message_source : public gr_sync_block
 
   friend gr_message_source_sptr
   gr_make_message_source(size_t itemsize, int msgq_limit);
+  friend gr_message_source_sptr
+  gr_make_message_source(size_t itemsize, gr_msg_queue_sptr msgq);
 
  protected:
   gr_message_source (size_t itemsize, int msgq_limit);
+  gr_message_source (size_t itemsize, gr_msg_queue_sptr msgq);
 
  public:
   ~gr_message_source ();