diff options
| author | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-03-04 15:26:28 -0600 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2021-03-04 15:26:36 -0600 |
| commit | b517f882eb8daed4d272ae5a77aaa3620e94eb9c (patch) | |
| tree | 3ffb0ca7c1445acd00ad4ef78fb792e253cc3293 | |
| parent | 5fc01186d30cd7aac83a65c804f936e32acdd0cf (diff) | |
| download | uhd-b517f882eb8daed4d272ae5a77aaa3620e94eb9c.tar.gz uhd-b517f882eb8daed4d272ae5a77aaa3620e94eb9c.tar.bz2 uhd-b517f882eb8daed4d272ae5a77aaa3620e94eb9c.zip | |
lib: Fix unresolved cleanup conflict (sorry!)
| -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; } |