From 27f6b0c29057a75c5478b54419ca8da5026de625 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carles.fernandez@gmail.com>
Date: Fri, 3 Apr 2020 00:41:51 +0200
Subject: [PATCH] Fixes for GNU Radio 3.9

---
 .../signal_source/adapters/fmcomms2_signal_source.h       | 8 ++++++++
 .../signal_source/adapters/osmosdr_signal_source.h        | 8 ++++++++
 .../signal_source/adapters/plutosdr_signal_source.h       | 8 ++++++++
 src/utils/front-end-cal/main.cc                           | 4 ++++
 4 files changed, 28 insertions(+)

diff --git a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
index cb395862c..e91e78a07 100644
--- a/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
+++ b/src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
@@ -34,6 +34,10 @@
 #include <cstdint>
 #include <memory>
 #include <string>
+#if GNURADIO_USES_STD_POINTERS
+#else
+#include <boost/shared_ptr.hpp>
+#endif
 
 class ConfigurationInterface;
 
@@ -117,7 +121,11 @@ private:
 
     gr::iio::fmcomms2_source_f32c::sptr fmcomms2_source_f32c_;
 
+#if GNURADIO_USES_STD_POINTERS
     std::shared_ptr<gr::block> valve_;
+#else
+    boost::shared_ptr<gr::block> valve_;
+#endif
     gr::blocks::file_sink::sptr file_sink_;
     std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
diff --git a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
index 79c67b07c..fd9230548 100644
--- a/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
+++ b/src/algorithms/signal_source/adapters/osmosdr_signal_source.h
@@ -31,6 +31,10 @@
 #include <osmosdr/source.h>
 #include <stdexcept>
 #include <string>
+#if GNURADIO_USES_STD_POINTERS
+#else
+#include <boost/shared_ptr.hpp>
+#endif
 
 class ConfigurationInterface;
 
@@ -98,7 +102,11 @@ private:
 
     std::string antenna_;
 
+#if GNURADIO_USES_STD_POINTERS
     std::shared_ptr<gr::block> valve_;
+#else
+    boost::shared_ptr<gr::block> valve_;
+#endif
     gr::blocks::file_sink::sptr file_sink_;
     std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
diff --git a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
index 5be21e53b..d701742a5 100644
--- a/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
+++ b/src/algorithms/signal_source/adapters/plutosdr_signal_source.h
@@ -33,6 +33,10 @@
 #include <cstdint>
 #include <memory>
 #include <string>
+#if GNURADIO_USES_STD_POINTERS
+#else
+#include <boost/shared_ptr.hpp>
+#endif
 
 
 class ConfigurationInterface;
@@ -102,7 +106,11 @@ private:
 
     gr::iio::pluto_source::sptr plutosdr_source_;
 
+#if GNURADIO_USES_STD_POINTERS
     std::shared_ptr<gr::block> valve_;
+#else
+    boost::shared_ptr<gr::block> valve_;
+#endif
     gr::blocks::file_sink::sptr file_sink_;
     std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
 };
diff --git a/src/utils/front-end-cal/main.cc b/src/utils/front-end-cal/main.cc
index 2525c59a1..c194904e5 100644
--- a/src/utils/front-end-cal/main.cc
+++ b/src/utils/front-end-cal/main.cc
@@ -465,7 +465,11 @@ int main(int argc, char** argv)
                     LOG(INFO) << "Exception caught while joining threads.";
                 }
             gnss_sync_vector.clear();
+#if GNURADIO_USES_STD_POINTERS
+            std::dynamic_pointer_cast<gr::blocks::file_source>(source)->seek(0, 0);
+#else
             boost::dynamic_pointer_cast<gr::blocks::file_source>(source)->seek(0, 0);
+#endif
             std::cout.flush();
         }
     std::cout << "]" << std::endl;