aboutsummaryrefslogtreecommitdiffstats
path: root/host/include
diff options
context:
space:
mode:
authorNicholas Corgan <nick.corgan@ettus.com>2015-07-27 12:04:32 -0700
committerMartin Braun <martin.braun@ettus.com>2015-07-30 10:43:22 -0700
commitb6ad4c0531ef56f4e197cccd06f1d11fc89e4aab (patch)
tree1935a9e031ed657bd8ac7372b14f550932b21fe2 /host/include
parentb6d594ebc7696635d9ed8787bf0a15e69ccdd4f9 (diff)
downloaduhd-b6ad4c0531ef56f4e197cccd06f1d11fc89e4aab.tar.gz
uhd-b6ad4c0531ef56f4e197cccd06f1d11fc89e4aab.tar.bz2
uhd-b6ad4c0531ef56f4e197cccd06f1d11fc89e4aab.zip
MSVC 2015 compatibility
Diffstat (limited to 'host/include')
-rw-r--r--host/include/uhd/transport/tcp_zero_copy.hpp4
-rw-r--r--host/include/uhd/transport/zero_copy.hpp2
2 files changed, 3 insertions, 3 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