From a168e5587671ec637178125d8b752dff38f39e68 Mon Sep 17 00:00:00 2001 From: falkTX Date: Sun, 31 Jul 2016 12:07:50 +0200 Subject: [PATCH] Fix some compiler warnings; Fix build with new gcc --- source/backend/engine/CarlaEngineBridge.cpp | 1 + source/backend/plugin/CarlaPluginGui.cpp | 4 ++++ source/backend/plugin/CarlaPluginInternal.hpp | 2 ++ source/backend/plugin/FluidSynthPlugin.cpp | 2 +- source/bridges/CarlaBridgeClient.cpp | 4 ++++ source/bridges/CarlaBridgeOsc.cpp | 3 +++ source/bridges/CarlaBridgePlugin.cpp | 6 ++++++ source/utils/RtList.hpp | 5 +++-- 8 files changed, 24 insertions(+), 3 deletions(-) diff --git a/source/backend/engine/CarlaEngineBridge.cpp b/source/backend/engine/CarlaEngineBridge.cpp index 3e60270..91cee3b 100644 --- a/source/backend/engine/CarlaEngineBridge.cpp +++ b/source/backend/engine/CarlaEngineBridge.cpp @@ -267,6 +267,7 @@ class CarlaEngineBridge : public CarlaEngine, if (kData->bufEvents.in != nullptr) { // TODO + (void)data; (void)time; } break; diff --git a/source/backend/plugin/CarlaPluginGui.cpp b/source/backend/plugin/CarlaPluginGui.cpp index e98c744..923009a 100644 --- a/source/backend/plugin/CarlaPluginGui.cpp +++ b/source/backend/plugin/CarlaPluginGui.cpp @@ -67,6 +67,10 @@ CarlaPluginGui::CarlaPluginGui(CarlaEngine* const engine, Callback* const callba if (! lastGeometry.isNull()) restoreGeometry(lastGeometry); } + + return; + // may be unused + (void)engine; } CarlaPluginGui::~CarlaPluginGui() diff --git a/source/backend/plugin/CarlaPluginInternal.hpp b/source/backend/plugin/CarlaPluginInternal.hpp index 97c776a..f01e402 100644 --- a/source/backend/plugin/CarlaPluginInternal.hpp +++ b/source/backend/plugin/CarlaPluginInternal.hpp @@ -29,6 +29,8 @@ #include "RtList.hpp" +#include + #define CARLA_PROCESS_CONTINUE_CHECK if (! fEnabled) { kData->engine->callback(CALLBACK_DEBUG, fId, 0, 0, 0.0f, "Processing while plugin is disabled!!"); return; } CARLA_BACKEND_START_NAMESPACE diff --git a/source/backend/plugin/FluidSynthPlugin.cpp b/source/backend/plugin/FluidSynthPlugin.cpp index 301e9aa..058a586 100644 --- a/source/backend/plugin/FluidSynthPlugin.cpp +++ b/source/backend/plugin/FluidSynthPlugin.cpp @@ -907,7 +907,7 @@ class FluidSynthPlugin : public CarlaPlugin fluid_preset_t f_preset; bool hasDrums = false; - uint32_t drumIndex, drumProg; + uint32_t drumIndex = 0, drumProg = 0; f_sfont = fluid_synth_get_sfont_by_id(fSynth, fSynthId); diff --git a/source/bridges/CarlaBridgeClient.cpp b/source/bridges/CarlaBridgeClient.cpp index d2fb0a1..08ee15f 100644 --- a/source/bridges/CarlaBridgeClient.cpp +++ b/source/bridges/CarlaBridgeClient.cpp @@ -40,6 +40,10 @@ CarlaBridgeClient::CarlaBridgeClient(const char* const uiTitle) CARLA_ASSERT(uiTitle != nullptr); #endif carla_debug("CarlaBridgeClient::CarlaBridgeClient(\"%s\")", uiTitle); + return; + + // may be unused + (void)uiTitle; } CarlaBridgeClient::~CarlaBridgeClient() diff --git a/source/bridges/CarlaBridgeOsc.cpp b/source/bridges/CarlaBridgeOsc.cpp index bcd2fd6..2fcc37f 100644 --- a/source/bridges/CarlaBridgeOsc.cpp +++ b/source/bridges/CarlaBridgeOsc.cpp @@ -207,6 +207,9 @@ int CarlaBridgeOsc::handleMessage(const char* const path, const int argc, const carla_stderr("CarlaBridgeOsc::handleMessage(\"%s\", ...) - received unsupported OSC method '%s'", path, method); return 1; + + // may be unused + (void)msg; } #ifdef BUILD_BRIDGE_UI diff --git a/source/bridges/CarlaBridgePlugin.cpp b/source/bridges/CarlaBridgePlugin.cpp index 09b23c0..32b8c34 100644 --- a/source/bridges/CarlaBridgePlugin.cpp +++ b/source/bridges/CarlaBridgePlugin.cpp @@ -438,6 +438,9 @@ int CarlaBridgeOsc::handleMsgPluginSetParameterMidiChannel(CARLA_BRIDGE_OSC_HAND // TODO return 0; + + // unused + (void)argc; (void)argv; (void)types; } int CarlaBridgeOsc::handleMsgPluginSetParameterMidiCC(CARLA_BRIDGE_OSC_HANDLE_ARGS) @@ -449,6 +452,9 @@ int CarlaBridgeOsc::handleMsgPluginSetParameterMidiCC(CARLA_BRIDGE_OSC_HANDLE_AR // TODO return 0; + + // unused + (void)argc; (void)argv; (void)types; } int CarlaBridgeOsc::handleMsgPluginSetChunk(CARLA_BRIDGE_OSC_HANDLE_ARGS) diff --git a/source/utils/RtList.hpp b/source/utils/RtList.hpp index 43c6715..80660b5 100644 --- a/source/utils/RtList.hpp +++ b/source/utils/RtList.hpp @@ -27,11 +27,12 @@ extern "C" { // Declare non copyable and prevent heap allocation #define LIST_DECLARATIONS(ClassName) \ +private: \ ClassName(ClassName&); \ ClassName(const ClassName&); \ + ClassName& operator=(ClassName&); \ ClassName& operator=(const ClassName&); \ - static void* operator new (size_t) { return nullptr; } \ - static void operator delete (void*) {} + static void* operator new (size_t); typedef struct list_head k_list_head;