From cdacf51bfb61a2372b4efcf53a5b40bedac068b5 Mon Sep 17 00:00:00 2001 From: f4exb Date: Mon, 12 Nov 2018 15:48:41 +0100 Subject: [PATCH] Windows: MSVC2017: fixed some attribute unused cases --- devices/hackrf/devicehackrf.h | 6 +----- sdrgui/soapygui/arginfogui.cpp | 5 +---- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/devices/hackrf/devicehackrf.h b/devices/hackrf/devicehackrf.h index 291e617b6..51ee822c2 100644 --- a/devices/hackrf/devicehackrf.h +++ b/devices/hackrf/devicehackrf.h @@ -30,11 +30,7 @@ public: protected: DeviceHackRF(); DeviceHackRF(const DeviceHackRF&) {} -#ifdef _MSC_VER - DeviceHackRF& operator=(const DeviceHackRF& other) { return *this; } -#else - DeviceHackRF& operator=(const DeviceHackRF& other __attribute__((unused))) { return *this; } -#endif + DeviceHackRF& operator=(const DeviceHackRF& other) { (void) other; return *this; } ~DeviceHackRF(); private: static hackrf_device *open_hackrf_from_sequence(int sequence); diff --git a/sdrgui/soapygui/arginfogui.cpp b/sdrgui/soapygui/arginfogui.cpp index d914df185..ae3705771 100644 --- a/sdrgui/soapygui/arginfogui.cpp +++ b/sdrgui/soapygui/arginfogui.cpp @@ -363,12 +363,9 @@ void ArgInfoGUI::on_argEdit_editingFinished() emit valueChanged(); } -#ifdef _MSC_VER void ArgInfoGUI::on_argCombo_currentIndexChanged(int index) -#else -void ArgInfoGUI::on_argCombo_currentIndexChanged(int index __attribute__((unused))) -#endif { + (void) index; QVariant v = ui->argCombo->currentData(); bool ok = false;