Changeset 9455

Show
Ignore:
Timestamp:
08/30/08 10:52:41
Author:
jcorgan
Message:

Don't return references

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • usrp2/trunk/host/include/usrp2/usrp2.h

    r9430 r9455  
    2424#include <vector> 
    2525#include <complex> 
    26 #include <iosfwd> 
     26//#include <iosfwd> 
    2727#include <usrp2/rx_sample_handler.h> 
    2828#include <usrp2/tune_result.h> 
    …… 
    8888     * Returns the MAC address associated with this USRP 
    8989     */ 
    90     const std::string &mac_addr(); 
     90    std::string mac_addr(); 
    9191 
    9292    /* 

  • usrp2/trunk/host/lib/usrp2.cc

    r9430 r9455  
    146146  } 
    147147   
    148   const std::string & 
     148  std::string 
    149149  usrp2::mac_addr() 
    150150  { 

  • usrp2/trunk/host/lib/usrp2_impl.h

    r9430 r9455  
    9595    void bg_loop(); 
    9696 
    97     const std::string &mac_addr() const { return d_addr; } // FIXME: convert from u2_mac_addr_t 
     97    std::string mac_addr() const { return d_addr; } // FIXME: convert from u2_mac_addr_t 
    9898    bool set_rx_gain(double gain); 
    9999    bool set_rx_center_freq(double frequency, tune_result *result);