Merge pull request #560 from chuot/compile-on-fedora35

Fix compile errors on Fedora 35
TrunkRecorder · Nov 30, 2021 · 8072483 · 8072483
2 parents cf8ed83 + 507353c
commit 8072483
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 4 deletions.
diff --git a/lib/op25_repeater/include/op25_repeater/analog_udp.h b/lib/op25_repeater/include/op25_repeater/analog_udp.h
@@ -37,8 +37,11 @@ namespace gr {
         class OP25_REPEATER_API analog_udp : virtual public gr::block
         {
             public:
+                #if GNURADIO_VERSION < 0x030900
                 typedef boost::shared_ptr<analog_udp> sptr;
-
+                #else
+                typedef std::shared_ptr<analog_udp> sptr;
+                #endif
                 /*!
                  * \brief Return a shared_ptr to a new instance of op25_repeater::analog_udp.
                  *

diff --git a/lib/op25_repeater/include/op25_repeater/frame_assembler.h b/lib/op25_repeater/include/op25_repeater/frame_assembler.h
@@ -37,8 +37,11 @@ namespace gr {
         class OP25_REPEATER_API frame_assembler : virtual public gr::block
         {
             public:
+                #if GNURADIO_VERSION < 0x030900
                 typedef boost::shared_ptr<frame_assembler> sptr;
-
+                #else
+                typedef std::shared_ptr<frame_assembler> sptr;
+                #endif
                 /*!
                  * \brief Return a shared_ptr to a new instance of op25_repeater::frame_assembler.
                  *

diff --git a/lib/op25_repeater/include/op25_repeater/iqfile_source.h b/lib/op25_repeater/include/op25_repeater/iqfile_source.h
@@ -37,8 +37,11 @@ class OP25_REPEATER_API iqfile_source : virtual public gr::sync_block
 {
 public:
     // gr::op25_repeater::iqfile_source::sptr
+    #if GNURADIO_VERSION < 0x030900
     typedef boost::shared_ptr<iqfile_source> sptr;
-
+    #else
+    typedef std::shared_ptr<iqfile_source> sptr;
+    #endif
     /*!
      * \brief Create a file source.
      *

diff --git a/lib/op25_repeater/include/op25_repeater/rmsagc_ff.h b/lib/op25_repeater/include/op25_repeater/rmsagc_ff.h
@@ -39,8 +39,11 @@ namespace gr {
         {
             public:
                 // gr::blocks::rmsagc_ff::sptr
+                #if GNURADIO_VERSION < 0x030900
                 typedef boost::shared_ptr<rmsagc_ff> sptr;
-
+                #else
+                typedef std::shared_ptr<rmsagc_ff> sptr;
+                #endif
                 /*!
                  * \brief Make an RMS calc. block.
                  * \param alpha gain for running average filter.