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/Volume | |
| parent | 8250e83e6188dffd26d6310e36af3132d93412dd (diff) | |
| download | VeraCrypt-0a2c565aa98fa7bc9623a753370e565fc5ed1e63.tar.gz VeraCrypt-0a2c565aa98fa7bc9623a753370e565fc5ed1e63.zip | |
Switch from auto_ptr to unique_ptr (#638)
Diffstat (limited to 'src/Volume')
| -rw-r--r-- | src/Volume/EncryptionThreadPool.cpp | 4 | ||||
| -rw-r--r-- | src/Volume/EncryptionThreadPool.h | 2 |
2 files changed, 2 insertions, 4 deletions
diff --git a/src/Volume/EncryptionThreadPool.cpp b/src/Volume/EncryptionThreadPool.cpp index 4219c7d7..04c32c7d 100644 --- a/src/Volume/EncryptionThreadPool.cpp +++ b/src/Volume/EncryptionThreadPool.cpp @@ -125,9 +125,7 @@ namespace VeraCrypt firstFragmentWorkItem->ItemCompletedEvent.Wait(); - auto_ptr <Exception> itemException; - if (firstFragmentWorkItem->ItemException.get()) - itemException = firstFragmentWorkItem->ItemException; + unique_ptr <Exception> itemException = std::move(firstFragmentWorkItem->ItemException); firstFragmentWorkItem->State.Set (WorkItem::State::Free); WorkItemCompletedEvent.Signal(); diff --git a/src/Volume/EncryptionThreadPool.h b/src/Volume/EncryptionThreadPool.h index 43aa4c80..baf31e23 100644 --- a/src/Volume/EncryptionThreadPool.h +++ b/src/Volume/EncryptionThreadPool.h @@ -44,7 +44,7 @@ namespace VeraCrypt }; struct WorkItem *FirstFragment; - auto_ptr <Exception> ItemException; + unique_ptr <Exception> ItemException; SyncEvent ItemCompletedEvent; SharedVal <size_t> OutstandingFragmentCount; SharedVal <State::Enum> State; |