[Commit-gnuradio] r3951 - in gnuradio/branches/developers/eb/mb: mblock/src/lib pmt/src/lib

[eb]

Author: eb
Date: 2006-11-07 18:46:38 -0700 (Tue, 07 Nov 2006)
New Revision: 3951

Modified:
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_common.h
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock.h
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.h
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime.h
   gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime_impl.h
   gnuradio/branches/developers/eb/mb/pmt/src/lib/pmt_int.h
Log:
used boost::noncopyable where appropriate

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_common.h
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_common.h       
2006-11-08 01:36:06 UTC (rev 3950)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_common.h       
2006-11-08 01:46:38 UTC (rev 3951)
@@ -24,12 +24,13 @@
 #include <pmt.h>
 #include <vector>
 #include <stdexcept>
+#include <boost/utility.hpp>
 
+
 typedef unsigned int   mb_pri_t;
 static const mb_pri_t  MB_PRI_DEFAULT = 5;
 
 
-
 class mb_runtime;
 typedef boost::shared_ptr<mb_runtime> mb_runtime_sptr;
 

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock.h
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock.h       
2006-11-08 01:36:06 UTC (rev 3950)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock.h       
2006-11-08 01:46:38 UTC (rev 3951)
@@ -57,16 +57,12 @@
  *
  * Subclass this to define your mblocks.
  */
-class mb_mblock
+class mb_mblock : boost::noncopyable
 {
 private:
   mb_mblock_impl              *d_impl;         // implementation details
   mb_runtime_sptr              d_runtime;      // associated runtime
 
-  // NOT IMPLEMENTED
-  mb_mblock (const mb_mblock &rhs);            // no copy constructor
-  mb_mblock &operator= (const mb_mblock &rhs);  // no assignment operator
-
   friend class mb_runtime;
 
 protected:

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.h
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.h  
2006-11-08 01:36:06 UTC (rev 3950)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_mblock_impl.h  
2006-11-08 01:46:38 UTC (rev 3951)
@@ -40,7 +40,7 @@
 /*!
  * \brief The private implementation details of the mblock system.
  */
-class mb_mblock_impl
+class mb_mblock_impl : boost::noncopyable
 {
 private:
 
@@ -48,10 +48,6 @@
   std::vector<mb_component>    d_components;   // our components
 
 
-  // NOT IMPLEMENTED
-  mb_mblock_impl(const mb_mblock_impl &rhs);            // no copy constructor
-  mb_mblock_impl &operator=(const mb_mblock_impl &rhs);  // no assignment 
operator
-
   mb_mblock_impl();
 
   friend class mb_mblock;

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime.h
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime.h      
2006-11-08 01:36:06 UTC (rev 3950)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime.h      
2006-11-08 01:46:38 UTC (rev 3951)
@@ -37,15 +37,11 @@
  * and that instance should be passed into the constructor of the
  * top-level mblock.
  */
-class mb_runtime
+class mb_runtime : boost::noncopyable
 {
 private:
   mb_runtime_impl_sptr         d_impl;           // implementation details
 
-  // NOT IMPLEMENTED
-  mb_runtime (const mb_runtime &rhs);            // no copy constructor
-  mb_runtime &operator= (const mb_runtime &rhs);  // no assignment operator
-
   mb_runtime();
 
   friend mb_runtime_sptr mb_make_runtime();

Modified: gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime_impl.h
===================================================================
--- gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime_impl.h 
2006-11-08 01:36:06 UTC (rev 3950)
+++ gnuradio/branches/developers/eb/mb/mblock/src/lib/mb_runtime_impl.h 
2006-11-08 01:46:38 UTC (rev 3951)
@@ -26,18 +26,13 @@
 /*!
  * \brief The private implementation details of the runtime system.
  */
-class mb_runtime_impl
+class mb_runtime_impl : boost::noncopyable
 {
 private:
+  friend class mb_runtime;
 
-  // NOT IMPLEMENTED
-  mb_runtime_impl(const mb_runtime_impl &rhs);            // no copy 
constructor
-  mb_runtime_impl &operator=(const mb_runtime_impl &rhs);  // no assignment 
operator
-
   mb_runtime_impl();
 
-  friend class mb_runtime;
-
 public:
   ~mb_runtime_impl();
 };

Modified: gnuradio/branches/developers/eb/mb/pmt/src/lib/pmt_int.h
===================================================================
--- gnuradio/branches/developers/eb/mb/pmt/src/lib/pmt_int.h    2006-11-08 
01:36:06 UTC (rev 3950)
+++ gnuradio/branches/developers/eb/mb/pmt/src/lib/pmt_int.h    2006-11-08 
01:46:38 UTC (rev 3951)
@@ -23,6 +23,7 @@
 #define INCLUDED_PMT_INT_H
 
 #include <pmt.h>
+#include <boost/utility.hpp>
 
 /*
  * EVERYTHING IN THIS FILE IS PRIVATE TO THE IMPLEMENTATION!
@@ -30,16 +31,11 @@
  * See pmt.h for the public interface
  */
 
-class pmt_base {
+class pmt_base : boost::noncopyable {
 protected:
   pmt_base(){};
   virtual ~pmt_base();
 
-private:
-  pmt_base(const pmt_base& rhs);               // NOT IMPLEMENTED
-  pmt_base& operator=(const pmt_base& rhs);    // NOT IMPLEMENTED
-  
-
 public:
   virtual bool is_bool()    const { return false; }
   virtual bool is_symbol()  const { return false; }