aboutsummaryrefslogtreecommitdiffstats
path: root/host/include
diff options
context:
space:
mode:
authorBen Hilburn <ben.hilburn@ettus.com>2014-05-08 13:51:11 -0700
committerBen Hilburn <ben.hilburn@ettus.com>2014-05-08 13:51:11 -0700
commit9ed3becc1b02628a24eb07e6d8cd70b42638c5f3 (patch)
treef72dba65430250db31e95fd6e5483ea03bbb0799 /host/include
parentfb90f34042b6ee5afb66955b6637d63ef384ddc9 (diff)
parent0e51394db05b3e66ed5f7335eff363d658b3f47c (diff)
downloaduhd-9ed3becc1b02628a24eb07e6d8cd70b42638c5f3.tar.gz
uhd-9ed3becc1b02628a24eb07e6d8cd70b42638c5f3.tar.bz2
uhd-9ed3becc1b02628a24eb07e6d8cd70b42638c5f3.zip
Merge branch 'maint'
Diffstat (limited to 'host/include')
-rw-r--r--host/include/uhd/utils/msg_task.hpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/host/include/uhd/utils/msg_task.hpp b/host/include/uhd/utils/msg_task.hpp
index 40ee65cb1..21c47a240 100644
--- a/host/include/uhd/utils/msg_task.hpp
+++ b/host/include/uhd/utils/msg_task.hpp
@@ -1,5 +1,5 @@
//
-// Copyright 2011-2013 Ettus Research LLC
+// Copyright 2011-2014 Ettus Research LLC
//
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@ namespace uhd{
memcpy(&v.front(), p, n);
return v;
}
- return std::vector<uint8_t>();
+ return std::vector<boost::uint8_t>();
}
/*!