diff options
| author | Martin Braun <martin.braun@ettus.com> | 2016-09-05 15:00:51 -0700 |
|---|---|---|
| committer | Martin Braun <martin.braun@ettus.com> | 2016-09-05 15:03:17 -0700 |
| commit | 8e5a81e2096887d7581fd232fb86cc303ca6ecc6 (patch) | |
| tree | f12308386319067c59ac9a6a5c98c1e9b26ba451 /host/lib/transport/super_recv_packet_handler.hpp | |
| parent | 83912104a9c1ab3631f755a4d98ee86e195db690 (diff) | |
| download | uhd-8e5a81e2096887d7581fd232fb86cc303ca6ecc6.tar.gz uhd-8e5a81e2096887d7581fd232fb86cc303ca6ecc6.tar.bz2 uhd-8e5a81e2096887d7581fd232fb86cc303ca6ecc6.zip | |
transport: Removed conditional compiles for terminator APIs
Diffstat (limited to 'host/lib/transport/super_recv_packet_handler.hpp')
| -rw-r--r-- | host/lib/transport/super_recv_packet_handler.hpp | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/host/lib/transport/super_recv_packet_handler.hpp b/host/lib/transport/super_recv_packet_handler.hpp index 5ca1da687..bd7f01c4f 100644 --- a/host/lib/transport/super_recv_packet_handler.hpp +++ b/host/lib/transport/super_recv_packet_handler.hpp @@ -18,6 +18,7 @@ #ifndef INCLUDED_LIBUHD_TRANSPORT_SUPER_RECV_PACKET_HANDLER_HPP #define INCLUDED_LIBUHD_TRANSPORT_SUPER_RECV_PACKET_HANDLER_HPP +#include "../rfnoc/rx_stream_terminator.hpp" #include <uhd/config.hpp> #include <uhd/exception.hpp> #include <uhd/convert.hpp> @@ -28,9 +29,6 @@ #include <uhd/types/metadata.hpp> #include <uhd/transport/vrt_if_packet.hpp> #include <uhd/transport/zero_copy.hpp> -#ifdef DEVICE3_STREAMER -# include "../rfnoc/rx_stream_terminator.hpp" -#endif #include <boost/dynamic_bitset.hpp> #include <boost/foreach.hpp> #include <boost/function.hpp> @@ -131,7 +129,6 @@ public: } } - #ifdef DEVICE3_STREAMER void set_terminator(uhd::rfnoc::rx_stream_terminator::sptr terminator) { _terminator = terminator; @@ -141,7 +138,6 @@ public: { return _terminator; } - #endif ////////////////// RFNOC /////////////////////////// /*! @@ -397,9 +393,7 @@ private: int recvd_packets; #endif - #ifdef DEVICE3_STREAMER uhd::rfnoc::rx_stream_terminator::sptr _terminator; - #endif /******************************************************************* * Get and process a single packet from the transport: |