X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/bcffb4d1a9edaa539770382e14129ac902da68d8..2e51fb3041e78ef15506ed746ed5898536be5955:/include/wx/scopeguard.h diff --git a/include/wx/scopeguard.h b/include/wx/scopeguard.h index a3a4fffa7e..da056e08db 100644 --- a/include/wx/scopeguard.h +++ b/include/wx/scopeguard.h @@ -366,7 +366,7 @@ public: static wxObjScopeGuardImpl3 MakeObjGuard(Obj& obj, MemFun memFun, P1 p1, P2 p2, P3 p3) { - return wxObjScopeGuardImpl3(obj, memFun, p1, p2, p3); + return wxObjScopeGuardImpl3(obj, memFun, p1, p2, p3); } ~wxObjScopeGuardImpl3() { wxPrivateOnScopeExit(*this); } @@ -411,7 +411,7 @@ template class VariableSetterImpl : public VariableSetterBase { public: - VariableSetterImpl(T& var, const U& value) + VariableSetterImpl(T& var, U value) : m_var(var), m_value(value) { @@ -424,7 +424,7 @@ public: private: T& m_var; - const U& m_value; + const U m_value; // suppress the warning about assignment operator not being generated VariableSetterImpl& operator=(const VariableSetterImpl&); @@ -454,7 +454,7 @@ private: template inline -wxPrivate::VariableSetterImpl wxMakeVarSetter(T& var, const U& value) +wxPrivate::VariableSetterImpl wxMakeVarSetter(T& var, U value) { return wxPrivate::VariableSetterImpl(var, value); }