Merge branch 'master' into next003_006_002_rc2

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;
                 }