[Commit-gnuradio] r9456 - gnuradio/branches/features/gr-usrp2/gr-usrp2/src

[jcorgan]

Author: jcorgan
Date: 2008-08-30 11:01:17 -0600 (Sat, 30 Aug 2008)
New Revision: 9456

Modified:
   gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2.i
   gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.cc
   gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.h
Log:
Don't return references

Modified: gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2.i
===================================================================
--- gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2.i    2008-08-30 
16:52:41 UTC (rev 9455)
+++ gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2.i    2008-08-30 
17:01:17 UTC (rev 9456)
@@ -103,7 +103,7 @@
   bool set_center_freq(double frequency, usrp2::tune_result *r);
   bool set_decim(int decimation_factor);
 
-  const std::string &mac_addr();
+  std::string mac_addr();
 };
 
 // create a more pythonic interface

Modified: gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.cc
===================================================================
--- gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.cc       
2008-08-30 16:52:41 UTC (rev 9455)
+++ gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.cc       
2008-08-30 17:01:17 UTC (rev 9456)
@@ -67,7 +67,7 @@
   return d_u2->set_rx_decim(decimation_factor);
 }
 
-const std::string &
+std::string
 usrp2_source_base::mac_addr()
 {
   return d_u2->mac_addr();

Modified: gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.h
===================================================================
--- gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.h        
2008-08-30 16:52:41 UTC (rev 9455)
+++ gnuradio/branches/features/gr-usrp2/gr-usrp2/src/usrp2_source_base.h        
2008-08-30 17:01:17 UTC (rev 9456)
@@ -42,11 +42,6 @@
   ~usrp2_source_base();
 
   /*!
-   * \brief Return USRP2 MAC address
-   */
-  const std::string &mac_addr() const { return d_u2->mac_addr(); }
-
-  /*!
    * \brief Set receiver gain
    */
   bool set_gain(double gain);
@@ -64,7 +59,7 @@
   /*!
    * \brief Get USRP2 hardware MAC address
    */
-  const std::string &mac_addr();
+  std::string mac_addr();
   
   /*!
    * \brief Derived class must override this