[Commit-gnuradio] r9455 - in usrp2/trunk/host: include/usrp2 lib

[jcorgan]

Author: jcorgan
Date: 2008-08-30 10:52:41 -0600 (Sat, 30 Aug 2008)
New Revision: 9455

Modified:
   usrp2/trunk/host/include/usrp2/usrp2.h
   usrp2/trunk/host/lib/usrp2.cc
   usrp2/trunk/host/lib/usrp2_impl.h
Log:
Don't return references

Modified: usrp2/trunk/host/include/usrp2/usrp2.h
===================================================================
--- usrp2/trunk/host/include/usrp2/usrp2.h      2008-08-30 03:22:50 UTC (rev 
9454)
+++ usrp2/trunk/host/include/usrp2/usrp2.h      2008-08-30 16:52:41 UTC (rev 
9455)
@@ -23,7 +23,7 @@
 #include <boost/utility.hpp>
 #include <vector>
 #include <complex>
-#include <iosfwd>
+//#include <iosfwd>
 #include <usrp2/rx_sample_handler.h>
 #include <usrp2/tune_result.h>
 #include <usrp2/rx_sample_handler.h>
@@ -87,7 +87,7 @@
     /*!
      * Returns the MAC address associated with this USRP
      */
-    const std::string &mac_addr();
+    std::string mac_addr();
 
     /*
      * ----------------------------------------------------------------

Modified: usrp2/trunk/host/lib/usrp2.cc
===================================================================
--- usrp2/trunk/host/lib/usrp2.cc       2008-08-30 03:22:50 UTC (rev 9454)
+++ usrp2/trunk/host/lib/usrp2.cc       2008-08-30 16:52:41 UTC (rev 9455)
@@ -145,7 +145,7 @@
     // NOP
   }
   
-  const std::string &
+  std::string
   usrp2::mac_addr()
   {
     return d_impl->mac_addr();

Modified: usrp2/trunk/host/lib/usrp2_impl.h
===================================================================
--- usrp2/trunk/host/lib/usrp2_impl.h   2008-08-30 03:22:50 UTC (rev 9454)
+++ usrp2/trunk/host/lib/usrp2_impl.h   2008-08-30 16:52:41 UTC (rev 9455)
@@ -94,7 +94,7 @@
     
     void bg_loop();
 
-    const std::string &mac_addr() const { return d_addr; } // FIXME: convert 
from u2_mac_addr_t
+    std::string mac_addr() const { return d_addr; } // FIXME: convert from 
u2_mac_addr_t
     bool set_rx_gain(double gain);
     bool set_rx_center_freq(double frequency, tune_result *result);
     bool set_rx_decim(int decimation_factor);