From b517f882eb8daed4d272ae5a77aaa3620e94eb9c Mon Sep 17 00:00:00 2001 From: Aaron Rossetto Date: Thu, 4 Mar 2021 15:26:28 -0600 Subject: lib: Fix unresolved cleanup conflict (sorry!) --- host/lib/include/uhdlib/transport/link_base.hpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'host/lib/include/uhdlib/transport/link_base.hpp') diff --git a/host/lib/include/uhdlib/transport/link_base.hpp b/host/lib/include/uhdlib/transport/link_base.hpp index 76b5c1ee3..8820d2b87 100644 --- a/host/lib/include/uhdlib/transport/link_base.hpp +++ b/host/lib/include/uhdlib/transport/link_base.hpp @@ -166,13 +166,9 @@ public: { } -<<<<<<< HEAD - size_t get_num_recv_frames() const override -======= virtual ~recv_link_base() = default; - virtual size_t get_num_recv_frames() const ->>>>>>> lib: Add some virtual dtors + size_t get_num_recv_frames() const override { return _num_recv_frames; } -- cgit v1.2.3