From 16f45254a36915f5f850d83af2afde0d81855119 Mon Sep 17 00:00:00 2001 From: Carles Fernandez Date: Sat, 4 Apr 2020 12:52:39 +0200 Subject: [PATCH] Fix building of OpenCL and CUDA blocks --- .../gnuradio_blocks/pcps_opencl_acquisition_cc.h | 8 ++++++++ .../gps_l1_ca_dll_pll_tracking_gpu_cc.h | 11 ++++++++++- 2 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h index e983f0a10..621dc7fe5 100644 --- a/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h +++ b/src/algorithms/acquisition/gnuradio_blocks/pcps_opencl_acquisition_cc.h @@ -53,10 +53,18 @@ #include // for weak_ptr #include #include +#if GNURADIO_USES_STD_POINTERS +#else +#include +#endif class pcps_opencl_acquisition_cc; +#if GNURADIO_USES_STD_POINTERS typedef std::shared_ptr pcps_opencl_acquisition_cc_sptr; +#else +typedef boost::shared_ptr pcps_opencl_acquisition_cc_sptr; +#endif pcps_opencl_acquisition_cc_sptr pcps_make_opencl_acquisition_cc( uint32_t sampled_ms, diff --git a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h index 5950adaa7..e5ea3b63c 100644 --- a/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h +++ b/src/algorithms/tracking/gnuradio_blocks/gps_l1_ca_dll_pll_tracking_gpu_cc.h @@ -34,12 +34,21 @@ #include #include #include - +#if GNURADIO_USES_STD_POINTERS +#include +#else +#include +#endif class Gps_L1_Ca_Dll_Pll_Tracking_GPU_cc; +#if GNURADIO_USES_STD_POINTERS typedef std::shared_ptr gps_l1_ca_dll_pll_tracking_gpu_cc_sptr; +#else +typedef boost::shared_ptr + gps_l1_ca_dll_pll_tracking_gpu_cc_sptr; +#end gps_l1_ca_dll_pll_tracking_gpu_cc_sptr gps_l1_ca_dll_pll_make_tracking_gpu_cc(