diff --git a/examples/GUI/OpenGLAppDemo.h b/examples/GUI/OpenGLAppDemo.h index ee5cbd6581..2fbcc8b1fb 100644 --- a/examples/GUI/OpenGLAppDemo.h +++ b/examples/GUI/OpenGLAppDemo.h @@ -205,7 +205,7 @@ public: attributes.reset(); uniforms .reset(); - shader.reset (newShader.release()); + shader = std::move (newShader); shader->use(); shape .reset (new Shape()); diff --git a/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp b/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp index 111c0f098c..9c4b1eec3c 100644 --- a/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp +++ b/extras/Projucer/Source/ComponentEditor/jucer_JucerDocument.cpp @@ -573,7 +573,7 @@ bool JucerDocument::reloadFromDocument() if (currentXML != nullptr && currentXML->isEquivalentTo (newXML.get(), true)) return true; - currentXML.reset (newXML.release()); + currentXML = std::move (newXML); stopTimer(); resources.loadFromCpp (getCppFile(), cppContent); diff --git a/modules/juce_core/javascript/juce_Javascript.cpp b/modules/juce_core/javascript/juce_Javascript.cpp index 855dffec7c..1582571c14 100644 --- a/modules/juce_core/javascript/juce_Javascript.cpp +++ b/modules/juce_core/javascript/juce_Javascript.cpp @@ -1278,7 +1278,7 @@ struct JavascriptEngine::RootObject : public DynamicObject Expression* parseFunctionCall (FunctionCall* call, ExpPtr& function) { std::unique_ptr s (call); - s->object.reset (function.release()); + s->object = std::move (function); match (TokenTypes::openParen); while (currentType != TokenTypes::closeParen) @@ -1304,7 +1304,7 @@ struct JavascriptEngine::RootObject : public DynamicObject if (matchIf (TokenTypes::openBracket)) { std::unique_ptr s (new ArraySubscript (location)); - s->object.reset (input.release()); + s->object = std::move (input); s->index.reset (parseExpression()); match (TokenTypes::closeBracket); return parseSuffixes (s.release()); @@ -1513,7 +1513,7 @@ struct JavascriptEngine::RootObject : public DynamicObject Expression* parseTernaryOperator (ExpPtr& condition) { std::unique_ptr e (new ConditionalOp (location)); - e->condition.reset (condition.release()); + e->condition = std::move (condition); e->trueBranch.reset (parseExpression()); match (TokenTypes::colon); e->falseBranch.reset (parseExpression()); diff --git a/modules/juce_gui_extra/native/juce_win32_ActiveXComponent.cpp b/modules/juce_gui_extra/native/juce_win32_ActiveXComponent.cpp index d5f98f874d..d4d9a45e07 100644 --- a/modules/juce_gui_extra/native/juce_win32_ActiveXComponent.cpp +++ b/modules/juce_gui_extra/native/juce_win32_ActiveXComponent.cpp @@ -459,7 +459,7 @@ bool ActiveXControlComponent::createControl (const void* controlIID) if (newControl->control->DoVerb (OLEIVERB_SHOW, nullptr, newControl->clientSite, 0, hwnd, &rect) == S_OK) { - control.reset (newControl.release()); + control = std::move (newControl); control->controlHWND = ActiveXHelpers::getHWND (this); if (control->controlHWND != nullptr)