mirror of
https://github.com/gnss-sdr/gnss-sdr
synced 2025-11-26 12:04:55 +00:00
Add compatibility with the new GNU Radio 3.9 API that uses C++11 standard smart pointers instead of Boost smart pointers
This commit is contained in:
@@ -38,6 +38,12 @@ target_link_libraries(resampler_gr_blocks
|
||||
Volk::volk
|
||||
)
|
||||
|
||||
if(GNURADIO_USES_STD_POINTERS)
|
||||
target_compile_definitions(resampler_gr_blocks
|
||||
PUBLIC -DGNURADIO_USES_STD_POINTERS=1
|
||||
)
|
||||
endif()
|
||||
|
||||
if(ENABLE_CLANG_TIDY)
|
||||
if(CLANG_TIDY_EXE)
|
||||
set_target_properties(resampler_gr_blocks
|
||||
|
||||
@@ -21,12 +21,21 @@
|
||||
#ifndef GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CB_H
|
||||
#define GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CB_H
|
||||
|
||||
#include <memory>
|
||||
#include <gnuradio/block.h>
|
||||
#include <cstdint>
|
||||
#if GNURADIO_USES_STD_POINTERS
|
||||
#include <memory>
|
||||
#else
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#endif
|
||||
|
||||
class direct_resampler_conditioner_cb;
|
||||
|
||||
#if GNURADIO_USES_STD_POINTERS
|
||||
using direct_resampler_conditioner_cb_sptr = std::shared_ptr<direct_resampler_conditioner_cb>;
|
||||
#else
|
||||
using direct_resampler_conditioner_cb_sptr = boost::shared_ptr<direct_resampler_conditioner_cb>;
|
||||
#endif
|
||||
|
||||
direct_resampler_conditioner_cb_sptr direct_resampler_make_conditioner_cb(
|
||||
double sample_freq_in,
|
||||
|
||||
@@ -28,13 +28,21 @@
|
||||
#ifndef GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CC_H
|
||||
#define GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CC_H
|
||||
|
||||
#include <memory>
|
||||
#include <gnuradio/block.h>
|
||||
#include <cstdint>
|
||||
#if GNURADIO_USES_STD_POINTERS
|
||||
#include <memory>
|
||||
#else
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#endif
|
||||
|
||||
class direct_resampler_conditioner_cc;
|
||||
|
||||
#if GNURADIO_USES_STD_POINTERS
|
||||
using direct_resampler_conditioner_cc_sptr = std::shared_ptr<direct_resampler_conditioner_cc>;
|
||||
#else
|
||||
using direct_resampler_conditioner_cc_sptr = boost::shared_ptr<direct_resampler_conditioner_cc>;
|
||||
#endif
|
||||
|
||||
direct_resampler_conditioner_cc_sptr direct_resampler_make_conditioner_cc(
|
||||
double sample_freq_in,
|
||||
|
||||
@@ -21,12 +21,20 @@
|
||||
#ifndef GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CS_H
|
||||
#define GNSS_SDR_DIRECT_RESAMPLER_CONDITIONER_CS_H
|
||||
|
||||
#include <memory>
|
||||
#include <gnuradio/block.h>
|
||||
#include <cstdint>
|
||||
#if GNURADIO_USES_STD_POINTERS
|
||||
#include <memory>
|
||||
#else
|
||||
#include <boost/shared_ptr.hpp>
|
||||
#endif
|
||||
|
||||
class direct_resampler_conditioner_cs;
|
||||
#if GNURADIO_USES_STD_POINTERS
|
||||
using direct_resampler_conditioner_cs_sptr = std::shared_ptr<direct_resampler_conditioner_cs>;
|
||||
#else
|
||||
using direct_resampler_conditioner_cs_sptr = boost::shared_ptr<direct_resampler_conditioner_cs>;
|
||||
#endif
|
||||
|
||||
direct_resampler_conditioner_cs_sptr direct_resampler_make_conditioner_cs(
|
||||
double sample_freq_in,
|
||||
|
||||
Reference in New Issue
Block a user