Remove unnecessary GNURadio version checks.

robotastic · Jun 5, 2022 · c202d5d · c202d5d
1 parent c66888e
commit c202d5d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 7 deletions.
diff --git a/plugins/openmhz_uploader/openmhz_uploader.cc b/plugins/openmhz_uploader/openmhz_uploader.cc
@@ -1,8 +1,6 @@
 #include <curl/curl.h>
 #include <time.h>
-#if GNURADIO_VERSION >= 0x030a00
 #include <iomanip>
-#endif
 #include <vector>
 
 #include "../../trunk-recorder/call_concluder/call_concluder.h"

diff --git a/plugins/rdioscanner_uploader/rdioscanner_uploader.cc b/plugins/rdioscanner_uploader/rdioscanner_uploader.cc
@@ -1,8 +1,6 @@
 #include <curl/curl.h>
 #include <time.h>
-#if GNURADIO_VERSION >= 0x030a00
 #include <iomanip>
-#endif
 #include <vector>
 
 #include "../../trunk-recorder/call_concluder/call_concluder.h"

diff --git a/trunk-recorder/recorders/debug_recorder_impl.h b/trunk-recorder/recorders/debug_recorder_impl.h
@@ -15,8 +15,7 @@
 #include <boost/shared_ptr.hpp>
 #if GNURADIO_VERSION < 0x030a00
 #include <gnuradio/blocks/udp_sink.h>
-#endif
-#if GNURADIO_VERSION >= 0x030a00
+#else
 #include <gnuradio/network/udp_sink.h>
 #endif
 
@@ -147,7 +146,7 @@ class debug_recorder_impl : public debug_recorder {
   gr::analog::sig_source_c::sptr bfo;
   gr::blocks::multiply_cc::sptr mixer;
   #if GNURADIO_VERSION >= 0x030a00
-  gr::blocks::network::udp_sink::sptr udp_sink
+  gr::network::udp_sink::sptr udp_sink
   #else
   gr::blocks::udp_sink::sptr udp_sink;
   #endif