diff --git a/source/backend/plugin/CarlaPlugin.cpp b/source/backend/plugin/CarlaPlugin.cpp index 7dd6c8ee4..5adf6ff44 100644 --- a/source/backend/plugin/CarlaPlugin.cpp +++ b/source/backend/plugin/CarlaPlugin.cpp @@ -1763,7 +1763,7 @@ void CarlaPlugin::updateOscData(const lo_address& source, const char* const url) carla_stdout("CarlaPlugin::updateOscData() - done"); } -bool CarlaPlugin::updateOscDataExtra() override +bool CarlaPlugin::updateOscDataExtra() { return false; } diff --git a/source/modules/native-plugins/vex/lookandfeel/MyLookAndFeel.cpp b/source/modules/native-plugins/vex/lookandfeel/MyLookAndFeel.cpp index 2ce8e592a..19515c47c 100644 --- a/source/modules/native-plugins/vex/lookandfeel/MyLookAndFeel.cpp +++ b/source/modules/native-plugins/vex/lookandfeel/MyLookAndFeel.cpp @@ -47,17 +47,17 @@ MyLookAndFeel::MyLookAndFeel() // Topaz->setHorizontalScale (1.0f); } -MyLookAndFeel::~MyLookAndFeel() override +MyLookAndFeel::~MyLookAndFeel() { delete Topaz; } -Font MyLookAndFeel::getComboBoxFont(ComboBox&) override +Font MyLookAndFeel::getComboBoxFont(ComboBox&) { return *Topaz; } -Font MyLookAndFeel::getPopupMenuFont() override +Font MyLookAndFeel::getPopupMenuFont() { return *Topaz; } @@ -66,7 +66,7 @@ void MyLookAndFeel::getIdealPopupMenuItemSize(const String& text, const bool isSeparator, int standardMenuItemHeight, int& idealWidth, - int& idealHeight) override + int& idealHeight) { if (isSeparator) { @@ -86,7 +86,7 @@ void MyLookAndFeel::getIdealPopupMenuItemSize(const String& text, void MyLookAndFeel::drawToggleButton(Graphics& g, ToggleButton& button, bool isMouseOverButton, - bool isButtonDown) override + bool isButtonDown) { const int tickWidth = jmin (20, button.getHeight() - 4); @@ -114,7 +114,7 @@ void MyLookAndFeel::drawRotarySlider(Graphics& g, float sliderPos, const float rotaryStartAngle, const float rotaryEndAngle, - Slider& /*slider*/) override + Slider& /*slider*/) { const float radius = jmin (width / 2, height / 2) - 2.0f; const float centreX = x + width * 0.5f; diff --git a/source/utils/CarlaPipeUtils.hpp b/source/utils/CarlaPipeUtils.hpp index fba460180..2a0a2c0f8 100644 --- a/source/utils/CarlaPipeUtils.hpp +++ b/source/utils/CarlaPipeUtils.hpp @@ -161,6 +161,17 @@ public: fail("failed to set pipe as non-block"); } + if (ret != -1) + { + // set to not close on exec + try { + ret = ::fcntl(fPipeRecv, F_SETFD, ::fcntl(fPipeRecv, F_GETFD) & ~FD_CLOEXEC); + } catch (...) { + ret = -1; + fail("failed to set pipe to not close on exec"); + } + } + //---------------------------------------------------------------- // wait a while for child process to confirm it is alive diff --git a/source/utils/JucePluginWindow.hpp b/source/utils/JucePluginWindow.hpp index 016ca206a..a527a0fe7 100644 --- a/source/utils/JucePluginWindow.hpp +++ b/source/utils/JucePluginWindow.hpp @@ -80,7 +80,7 @@ public: return fClosed; } - void setTransientWinId(const uintptr_t winId) const override + void setTransientWinId(const uintptr_t winId) const { CARLA_SAFE_ASSERT_RETURN(winId != 0,);