From: Vadim Zeitlin Date: Fri, 21 Sep 2007 12:27:25 +0000 (+0000) Subject: make wxScopeGuardImplBase copy ctor public to avoid Sun CC warnings X-Git-Url: https://git.saurik.com/wxWidgets.git/commitdiff_plain/f7e81ed1c2c7bd4d18b3982a35180f96aeb726aa?ds=sidebyside make wxScopeGuardImplBase copy ctor public to avoid Sun CC warnings git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@48865 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- diff --git a/include/wx/scopeguard.h b/include/wx/scopeguard.h index 45dee8caef..f1f5a8204c 100644 --- a/include/wx/scopeguard.h +++ b/include/wx/scopeguard.h @@ -103,6 +103,12 @@ class wxScopeGuardImplBase public: wxScopeGuardImplBase() : m_wasDismissed(false) { } + wxScopeGuardImplBase(const wxScopeGuardImplBase& other) + : m_wasDismissed(other.m_wasDismissed) + { + other.Dismiss(); + } + void Dismiss() const { m_wasDismissed = true; } // for OnScopeExit() only (we can't make it friend, unfortunately)! @@ -111,12 +117,6 @@ public: protected: ~wxScopeGuardImplBase() { } - wxScopeGuardImplBase(const wxScopeGuardImplBase& other) - : m_wasDismissed(other.m_wasDismissed) - { - other.Dismiss(); - } - // must be mutable for copy ctor to work mutable bool m_wasDismissed;