[Commit-gnuradio] r3960 - gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime

[jcorgan]

Author: jcorgan
Date: 2006-11-08 15:54:55 -0700 (Wed, 08 Nov 2006)
New Revision: 3960

Modified:
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
   
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
Log:
Work in progress.  Pass strings by reference where possible.

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
   2006-11-08 22:15:01 UTC (rev 3959)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.cc
   2006-11-08 22:54:55 UTC (rev 3960)
@@ -36,7 +36,7 @@
     return s_ncurrently_allocated;
 }
 
-gr_basic_block::gr_basic_block(const std::string name,
+gr_basic_block::gr_basic_block(const std::string &name,
                                gr_io_signature_sptr input_signature,
                                gr_io_signature_sptr output_signature) 
   : d_name(name),

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
    2006-11-08 22:15:01 UTC (rev 3959)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_basic_block.h
    2006-11-08 22:54:55 UTC (rev 3960)
@@ -46,7 +46,7 @@
     gr_io_signature_sptr d_output_signature;
     long                d_unique_id;
         
-    gr_basic_block(const std::string name,
+    gr_basic_block(const std::string &name,
                    gr_io_signature_sptr input_signature,
                    gr_io_signature_sptr output_signature);
 
@@ -60,7 +60,7 @@
         d_output_signature = iosig;
     }
 
-    //! overridden in gr_block and gr_hier_block2 for type sepcific behavior
+    //! overridden in gr_block and gr_hier_block2 for type specific behavior
     virtual bool validate() { return true; }
 
 public:

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
   2006-11-08 22:15:01 UTC (rev 3959)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.cc
   2006-11-08 22:54:55 UTC (rev 3960)
@@ -29,14 +29,14 @@
 #include <gr_io_signature.h>
 #include <iostream>
 
-gr_hier_block2_sptr gr_make_hier_block2(const std::string name, 
+gr_hier_block2_sptr gr_make_hier_block2(const std::string &name, 
                                        gr_io_signature_sptr input_signature,
                                        gr_io_signature_sptr output_signature)
 {
     return gr_hier_block2_sptr(new gr_hier_block2(name, input_signature, 
output_signature));
 }
 
-gr_hier_block2::gr_hier_block2(const std::string name,
+gr_hier_block2::gr_hier_block2(const std::string &name,
                               gr_io_signature_sptr input_signature,
                               gr_io_signature_sptr output_signature)
   : gr_basic_block(name, input_signature, output_signature),
@@ -50,14 +50,14 @@
 }
 
 void 
-gr_hier_block2::define_component(const std::string name, gr_basic_block_sptr 
basic_block)
+gr_hier_block2::define_component(const std::string &name, gr_basic_block_sptr 
basic_block)
 {
     d_impl->define_component(name, basic_block);
 }
 
 void 
-gr_hier_block2::connect(const std::string src_name, int src_port, 
-                        const std::string dst_name, int dst_port)
+gr_hier_block2::connect(const std::string &src_name, int src_port, 
+                        const std::string &dst_name, int dst_port)
 {
     gr_io_signature_sptr src_io_signature;
     gr_io_signature_sptr dst_io_signature;

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
    2006-11-08 22:15:01 UTC (rev 3959)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.h
    2006-11-08 22:54:55 UTC (rev 3960)
@@ -27,7 +27,7 @@
 /*!
  * \brief public constructor for gr_hier_block2
  */
-gr_hier_block2_sptr gr_make_hier_block2(const std::string name,
+gr_hier_block2_sptr gr_make_hier_block2(const std::string &name,
                                        gr_io_signature_sptr input_signature,
                                        gr_io_signature_sptr output_signature);
 
@@ -40,7 +40,7 @@
 class gr_hier_block2 : public gr_basic_block 
 {
 private:
-    friend gr_hier_block2_sptr gr_make_hier_block2(const std::string name,
+    friend gr_hier_block2_sptr gr_make_hier_block2(const std::string &name,
                                                   gr_io_signature_sptr 
input_signature,
                                                   gr_io_signature_sptr 
output_signature);
 
@@ -50,16 +50,16 @@
     gr_hier_block2_impl *d_impl;
     
 protected: 
-    gr_hier_block2(const std::string name,
+    gr_hier_block2(const std::string &name,
                   gr_io_signature_sptr input_signature,
                   gr_io_signature_sptr output_signature);
 
 public:
     ~gr_hier_block2();
 
-    void define_component(const std::string name, gr_basic_block_sptr 
basic_block);
-    void connect(const std::string src_name, int src_port, 
-                 const std::string dst_name, int dst_port);
+    void define_component(const std::string &name, gr_basic_block_sptr 
basic_block);
+    void connect(const std::string &src_name, int src_port, 
+                 const std::string &dst_name, int dst_port);
 
     // Overrides gr_basic_block, performs recursive validation of connections
     bool validate();

Modified: 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
===================================================================
--- 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
    2006-11-08 22:15:01 UTC (rev 3959)
+++ 
gnuradio/branches/developers/jcorgan/hier/gnuradio-core/src/lib/runtime/gr_hier_block2.i
    2006-11-08 22:54:55 UTC (rev 3960)
@@ -47,10 +47,10 @@
     ~gr_hier_block2 ();
 
     // Add a named block to the container
-    void define_component(const std::string name, gr_basic_block_sptr 
basic_block)
+    void define_component(const std::string &name, gr_basic_block_sptr 
basic_block)
        throw (std::invalid_argument);
-    void connect(const std::string src_name, int src_port,
-                const std::string dst_name, int dst_port)
+    void connect(const std::string &src_name, int src_port,
+                const std::string &dst_name, int dst_port)
        throw (std::invalid_argument);
     bool validate();
 };