From 350f5c5decca20a54132867283448fd32226bbc2 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Thu, 11 Feb 2010 20:24:01 -0800
Subject: Getting hello packets from the usrp2 with ip and mac addrs. Cleaned
 up the mb build system a bit.

---
 include/uhd/device.hpp        | 2 +-
 include/uhd/transport/udp.hpp | 7 +++----
 include/uhd/usrp/usrp.hpp     | 4 ++--
 include/uhd/wax.hpp           | 3 ---
 4 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'include')

diff --git a/include/uhd/device.hpp b/include/uhd/device.hpp
index 84d1c1bfb..09a2bbb2f 100644
--- a/include/uhd/device.hpp
+++ b/include/uhd/device.hpp
@@ -73,7 +73,7 @@ public:
 
     //the io interface
     virtual void send_raw(const std::vector<boost::asio::const_buffer> &) = 0;
-    virtual const boost::asio::const_buffer recv_raw(void) = 0;
+    virtual boost::asio::const_buffer recv_raw(void) = 0;
 };
 
 } //namespace uhd
diff --git a/include/uhd/transport/udp.hpp b/include/uhd/transport/udp.hpp
index 67979afac..c9a9dd53b 100644
--- a/include/uhd/transport/udp.hpp
+++ b/include/uhd/transport/udp.hpp
@@ -52,17 +52,16 @@ public:
 
     /*!
      * Send a single buffer.
-     * \param buff a pointer into memory
-     * \param len the length in bytes
+     * \param buff single asio buffer
      */
-    void send(const void *buff, size_t len);
+    void send(const boost::asio::const_buffer &buff);
 
     /*!
      * Receive a buffer. The memory is managed internally.
      * Calling recv will invalidate the buffer of the previous recv.
      * \return an asio const buffer with internal memory
      */
-    const boost::asio::const_buffer recv(void);
+    boost::asio::const_buffer recv(void);
 
 private:
     boost::asio::ip::udp::socket   *_socket;
diff --git a/include/uhd/usrp/usrp.hpp b/include/uhd/usrp/usrp.hpp
index 84890b8fe..975debed1 100644
--- a/include/uhd/usrp/usrp.hpp
+++ b/include/uhd/usrp/usrp.hpp
@@ -37,7 +37,7 @@ public:
 
     //the io interface
     void send_raw(const std::vector<boost::asio::const_buffer> &);
-    const boost::asio::const_buffer recv_raw(void);
+    boost::asio::const_buffer recv_raw(void);
 
 private:
     void get(const wax::obj &, wax::obj &);
@@ -45,7 +45,7 @@ private:
 
     std::map<std::string, mboard::base::sptr> _mboards;
     boost::function<void(const std::vector<boost::asio::const_buffer> &)> _send_raw_cb;
-    boost::function<const boost::asio::const_buffer(void)> _recv_raw_cb;
+    boost::function<boost::asio::const_buffer(void)> _recv_raw_cb;
 };
 
 }} //namespace
diff --git a/include/uhd/wax.hpp b/include/uhd/wax.hpp
index 29a96cdb6..1d5054351 100644
--- a/include/uhd/wax.hpp
+++ b/include/uhd/wax.hpp
@@ -164,7 +164,4 @@ namespace wax{
 
 } //namespace wax
 
-//ability to use wax::obj with stream operators
-std::ostream& operator<<(std::ostream &, const wax::obj &);
-
 #endif /* INCLUDED_WAX_HPP */
-- 
cgit v1.2.3