diff options
Diffstat (limited to 'host/lib/include')
| -rw-r--r-- | host/lib/include/uhdlib/transport/link_base.hpp | 6 |
1 files changed, 1 insertions, 5 deletions
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; } |