diff options
| author | Nicholas Corgan <nick.corgan@ettus.com> | 2015-07-27 12:04:32 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2015-07-30 10:43:22 -0700 |
| commit | b6ad4c0531ef56f4e197cccd06f1d11fc89e4aab (patch) | |
| tree | 1935a9e031ed657bd8ac7372b14f550932b21fe2 | |
| parent | b6d594ebc7696635d9ed8787bf0a15e69ccdd4f9 (diff) | |
| download | uhd-b6ad4c0531ef56f4e197cccd06f1d11fc89e4aab.tar.gz uhd-b6ad4c0531ef56f4e197cccd06f1d11fc89e4aab.tar.bz2 uhd-b6ad4c0531ef56f4e197cccd06f1d11fc89e4aab.zip | |
MSVC 2015 compatibility
| -rw-r--r-- | host/include/uhd/transport/tcp_zero_copy.hpp | 4 | ||||
| -rw-r--r-- | host/include/uhd/transport/zero_copy.hpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_cbx.cpp | 2 | ||||
| -rw-r--r-- | host/lib/usrp/dboard/db_sbx_common.hpp | 4 |
4 files changed, 6 insertions, 6 deletions
diff --git a/host/include/uhd/transport/tcp_zero_copy.hpp b/host/include/uhd/transport/tcp_zero_copy.hpp index 52e94fab9..ac282d8a2 100644 --- a/host/include/uhd/transport/tcp_zero_copy.hpp +++ b/host/include/uhd/transport/tcp_zero_copy.hpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2014 Ettus Research LLC +// Copyright 2010-2015 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 @@ -32,7 +32,7 @@ namespace uhd{ namespace transport{ */ struct UHD_API tcp_zero_copy : public virtual zero_copy_if { - virtual ~tcp_zero_copy(void) = 0; + virtual ~tcp_zero_copy(void); /*! * Make a new zero copy TCP transport: diff --git a/host/include/uhd/transport/zero_copy.hpp b/host/include/uhd/transport/zero_copy.hpp index 9ff3042aa..de1b17e1a 100644 --- a/host/include/uhd/transport/zero_copy.hpp +++ b/host/include/uhd/transport/zero_copy.hpp @@ -1,5 +1,5 @@ // -// Copyright 2010-2012 Ettus Research LLC +// Copyright 2010-2012,2015 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 diff --git a/host/lib/usrp/dboard/db_cbx.cpp b/host/lib/usrp/dboard/db_cbx.cpp index 8336117b8..daf9a8dfd 100644 --- a/host/lib/usrp/dboard/db_cbx.cpp +++ b/host/lib/usrp/dboard/db_cbx.cpp @@ -38,7 +38,7 @@ sbx_xcvr::cbx::~cbx(void){ /* NOP */ } -void sbx_xcvr::cbx::write_lo_regs(dboard_iface::unit_t unit, std::vector<boost::uint32_t> ®s) +void sbx_xcvr::cbx::write_lo_regs(dboard_iface::unit_t unit, const std::vector<boost::uint32_t> ®s) { BOOST_FOREACH(boost::uint32_t reg, regs) { diff --git a/host/lib/usrp/dboard/db_sbx_common.hpp b/host/lib/usrp/dboard/db_sbx_common.hpp index a08d22537..4800bbd83 100644 --- a/host/lib/usrp/dboard/db_sbx_common.hpp +++ b/host/lib/usrp/dboard/db_sbx_common.hpp @@ -1,5 +1,5 @@ // -// Copyright 2011-2014 Ettus Research LLC +// Copyright 2011-2015 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 @@ -225,7 +225,7 @@ protected: /*! This is the registered instance of the wrapper class, sbx_base. */ sbx_xcvr *self_base; private: - void write_lo_regs(dboard_iface::unit_t unit, std::vector<boost::uint32_t> ®s); + void write_lo_regs(dboard_iface::unit_t unit, const std::vector<boost::uint32_t> ®s); max287x_iface::sptr _txlo; max287x_iface::sptr _rxlo; }; |