aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBen Hilburn <ben.hilburn@ettus.com>2013-12-12 17:47:18 -0800
committerBen Hilburn <ben.hilburn@ettus.com>2013-12-12 17:47:18 -0800
commit8a68ce1438f7e121bff07ccbfde83b7b72a57aee (patch)
tree652cc0f68181d9551460b6553fff0b6e2d4c8551
parentcd9dbc9aee17cbddc68d83c97e1b487d4b43060a (diff)
parentd97ef4caa3a064d9641465fd42dff19476ad2621 (diff)
downloaduhd-8a68ce1438f7e121bff07ccbfde83b7b72a57aee.tar.gz
uhd-8a68ce1438f7e121bff07ccbfde83b7b72a57aee.tar.bz2
uhd-8a68ce1438f7e121bff07ccbfde83b7b72a57aee.zip
Merge remote-tracking branch 'origin/mergeme/fix_237'
-rw-r--r--host/include/uhd/utils/msg_task.hpp9
1 files changed, 5 insertions, 4 deletions
diff --git a/host/include/uhd/utils/msg_task.hpp b/host/include/uhd/utils/msg_task.hpp
index ebb29af08..40ee65cb1 100644
--- a/host/include/uhd/utils/msg_task.hpp
+++ b/host/include/uhd/utils/msg_task.hpp
@@ -24,14 +24,15 @@
#include <boost/function.hpp>
#include <boost/utility.hpp>
#include <boost/optional/optional.hpp>
+#include <boost/cstdint.hpp>
#include <vector>
namespace uhd{
class UHD_API msg_task : boost::noncopyable{
public:
typedef boost::shared_ptr<msg_task> sptr;
- typedef std::vector<uint8_t> msg_payload_t;
- typedef std::pair<uint32_t, msg_payload_t > msg_type_t;
+ typedef std::vector<boost::uint8_t> msg_payload_t;
+ typedef std::pair<boost::uint32_t, msg_payload_t > msg_type_t;
typedef boost::function<boost::optional<msg_type_t>(void)> task_fcn_type;
/*
@@ -41,9 +42,9 @@ namespace uhd{
*/
virtual msg_payload_t get_msg_from_dump_queue(boost::uint32_t sid) = 0;
- inline static std::vector<uint8_t> buff_to_vector(uint8_t* p, size_t n) {
+ inline static std::vector<boost::uint8_t> buff_to_vector(boost::uint8_t* p, size_t n) {
if(p and n > 0){
- std::vector<uint8_t> v(n);
+ std::vector<boost::uint8_t> v(n);
memcpy(&v.front(), p, n);
return v;
}