From 13222cac8d1deb0cc8097db84d8dc87392562a4e Mon Sep 17 00:00:00 2001 From: Daniele Forsi Date: Mon, 8 Apr 2024 22:38:59 +0200 Subject: [PATCH] Fix compilation depending of order of includes adsbdemodsink.h was getting the definition of class Message from dsp/dspcommands.h which was included by adsbdemodsink.cpp before including adsbdemodsink.h itself. --- plugins/channelrx/demodadsb/adsbdemodsink.cpp | 8 -------- plugins/channelrx/demodadsb/adsbdemodsink.h | 2 -- plugins/channelrx/demodadsb/adsbdemodsinkworker.h | 1 + 3 files changed, 1 insertion(+), 10 deletions(-) diff --git a/plugins/channelrx/demodadsb/adsbdemodsink.cpp b/plugins/channelrx/demodadsb/adsbdemodsink.cpp index 4590e70fd..6079c45a1 100644 --- a/plugins/channelrx/demodadsb/adsbdemodsink.cpp +++ b/plugins/channelrx/demodadsb/adsbdemodsink.cpp @@ -19,14 +19,6 @@ #include #include -#include "util/stepfunctions.h" -#include "util/db.h" -#include "dsp/dspengine.h" -#include "dsp/dspcommands.h" -#include "dsp/devicesamplemimo.h" -#include "device/deviceapi.h" - -#include "adsbdemodreport.h" #include "adsbdemodsink.h" #include "adsbdemodsinkworker.h" #include "adsb.h" diff --git a/plugins/channelrx/demodadsb/adsbdemodsink.h b/plugins/channelrx/demodadsb/adsbdemodsink.h index 47809041b..bba83279e 100644 --- a/plugins/channelrx/demodadsb/adsbdemodsink.h +++ b/plugins/channelrx/demodadsb/adsbdemodsink.h @@ -25,10 +25,8 @@ #include "dsp/channelsamplesink.h" #include "dsp/nco.h" #include "dsp/interpolator.h" -#include "util/movingaverage.h" #include "adsbdemodsettings.h" -#include "adsbdemodstats.h" #include "adsbdemodsinkworker.h" class ADSBDemodSink : public ChannelSampleSink { diff --git a/plugins/channelrx/demodadsb/adsbdemodsinkworker.h b/plugins/channelrx/demodadsb/adsbdemodsinkworker.h index db60e57b8..4c907040f 100644 --- a/plugins/channelrx/demodadsb/adsbdemodsinkworker.h +++ b/plugins/channelrx/demodadsb/adsbdemodsinkworker.h @@ -23,6 +23,7 @@ #include "dsp/dsptypes.h" #include "util/crc.h" +#include "util/message.h" #include "util/messagequeue.h" #include "adsbdemodstats.h"