diff options
author | Christopher Bergqvist <chris@digitalpoetry.se> | 2020-06-11 18:02:28 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-11 18:02:28 +0200 |
commit | 0a2c565aa98fa7bc9623a753370e565fc5ed1e63 (patch) | |
tree | f89c65090af0da4ef3c1915ba797b9a2cda75f9c /src/Main/GraphicUserInterface.cpp | |
parent | 8250e83e6188dffd26d6310e36af3132d93412dd (diff) | |
download | VeraCrypt-0a2c565aa98fa7bc9623a753370e565fc5ed1e63.tar.gz VeraCrypt-0a2c565aa98fa7bc9623a753370e565fc5ed1e63.zip |
Switch from auto_ptr to unique_ptr (#638)
Diffstat (limited to 'src/Main/GraphicUserInterface.cpp')
-rwxr-xr-x | src/Main/GraphicUserInterface.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp index b7b4cf45..f1bb87b2 100755 --- a/src/Main/GraphicUserInterface.cpp +++ b/src/Main/GraphicUserInterface.cpp @@ -344,7 +344,7 @@ namespace VeraCrypt void GraphicUserInterface::BeginInteractiveBusyState (wxWindow *window) { - static auto_ptr <wxCursor> arrowWaitCursor; + static unique_ptr <wxCursor> arrowWaitCursor; if (arrowWaitCursor.get() == nullptr) arrowWaitCursor.reset (new wxCursor (wxCURSOR_ARROWWAIT)); @@ -409,7 +409,7 @@ namespace VeraCrypt void GraphicUserInterface::EndInteractiveBusyState (wxWindow *window) const { - static auto_ptr <wxCursor> arrowCursor; + static unique_ptr <wxCursor> arrowCursor; if (arrowCursor.get() == nullptr) arrowCursor.reset (new wxCursor (wxCURSOR_ARROW)); @@ -632,7 +632,7 @@ namespace VeraCrypt try { - SecurityToken::InitLibrary (Preferences.SecurityTokenModule, auto_ptr <GetPinFunctor> (new PinRequestHandler), auto_ptr <SendExceptionFunctor> (new WarningHandler)); + SecurityToken::InitLibrary (Preferences.SecurityTokenModule, unique_ptr <GetPinFunctor> (new PinRequestHandler), unique_ptr <SendExceptionFunctor> (new WarningHandler)); } catch (Exception &e) { @@ -965,8 +965,8 @@ namespace VeraCrypt wxConnectionBase *OnMakeConnection () { return new Connection; } }; - auto_ptr <wxDDEClient> client (new Client); - auto_ptr <wxConnectionBase> connection (client->MakeConnection (L"localhost", serverName, L"raise")); + unique_ptr <wxDDEClient> client (new Client); + unique_ptr <wxConnectionBase> connection (client->MakeConnection (L"localhost", serverName, L"raise")); if (connection.get() && connection->Execute (nullptr)) { |