mirrors/gnss-sdr
1
0
Fork 0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2024-12-14 12:10:34 +00:00
Code Issues Releases Wiki Activity

Fixes for GNU Radio 3.9

Browse Source
This commit is contained in:
Carles Fernandez 2020-04-03 00:41:51 +02:00
parent 865a54ddff
commit 27f6b0c290
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
4 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/algorithms/signal_source/adapters/fmcomms2_signal_source.h
View File

@ -34,6 +34,10 @@
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
#include <string> #include <string>
#if GNURADIO_USES_STD_POINTERS
#else
#include <boost/shared_ptr.hpp>
#endif
class ConfigurationInterface; class ConfigurationInterface;
@ -117,7 +121,11 @@ private:
gr::iio::fmcomms2_source_f32c::sptr fmcomms2_source_f32c_; gr::iio::fmcomms2_source_f32c::sptr fmcomms2_source_f32c_;
#if GNURADIO_USES_STD_POINTERS
std::shared_ptr<gr::block> valve_; std::shared_ptr<gr::block> valve_;
#else
boost::shared_ptr<gr::block> valve_;
#endif
gr::blocks::file_sink::sptr file_sink_; gr::blocks::file_sink::sptr file_sink_;
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_; std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
}; };

8
src/algorithms/signal_source/adapters/osmosdr_signal_source.h
View File

@ -31,6 +31,10 @@
#include <osmosdr/source.h> #include <osmosdr/source.h>
#include <stdexcept> #include <stdexcept>
#include <string> #include <string>
#if GNURADIO_USES_STD_POINTERS
#else
#include <boost/shared_ptr.hpp>
#endif
class ConfigurationInterface; class ConfigurationInterface;
@ -98,7 +102,11 @@ private:
std::string antenna_; std::string antenna_;
#if GNURADIO_USES_STD_POINTERS
std::shared_ptr<gr::block> valve_; std::shared_ptr<gr::block> valve_;
#else
boost::shared_ptr<gr::block> valve_;
#endif
gr::blocks::file_sink::sptr file_sink_; gr::blocks::file_sink::sptr file_sink_;
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_; std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
}; };

8
src/algorithms/signal_source/adapters/plutosdr_signal_source.h
View File

@ -33,6 +33,10 @@
#include <cstdint> #include <cstdint>
#include <memory> #include <memory>
#include <string> #include <string>
#if GNURADIO_USES_STD_POINTERS
#else
#include <boost/shared_ptr.hpp>
#endif
class ConfigurationInterface; class ConfigurationInterface;
@ -102,7 +106,11 @@ private:
gr::iio::pluto_source::sptr plutosdr_source_; gr::iio::pluto_source::sptr plutosdr_source_;
#if GNURADIO_USES_STD_POINTERS
std::shared_ptr<gr::block> valve_; std::shared_ptr<gr::block> valve_;
#else
boost::shared_ptr<gr::block> valve_;
#endif
gr::blocks::file_sink::sptr file_sink_; gr::blocks::file_sink::sptr file_sink_;
std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_; std::shared_ptr<Concurrent_Queue<pmt::pmt_t>> queue_;
}; };

4
src/utils/front-end-cal/main.cc
View File

@ -465,7 +465,11 @@ int main(int argc, char** argv)
LOG(INFO) << "Exception caught while joining threads."; LOG(INFO) << "Exception caught while joining threads.";
} }
gnss_sync_vector.clear(); 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); boost::dynamic_pointer_cast<gr::blocks::file_source>(source)->seek(0, 0);
#endif
std::cout.flush(); std::cout.flush();
} }
std::cout << "]" << std::endl; std::cout << "]" << std::endl;