VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Core/Unix
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2020-06-26 01:18:40 +0200
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2020-06-26 01:22:18 +0200
commit5fb407cffebb8ec0cc50cb3e96e1bebf79ad1bc0 (patch)
treef621b8428b6390cb7f01d64fe72a7bd6ce400d9a /src/Core/Unix
parent4137c5e15bf3d784f3e6a84a1268f592910f9a67 (diff)
downloadVeraCrypt-5fb407cffebb8ec0cc50cb3e96e1bebf79ad1bc0.tar.gz
VeraCrypt-5fb407cffebb8ec0cc50cb3e96e1bebf79ad1bc0.zip
Linux/MacOSX: use standard std::shared_ptr instead of our custom implementation which is kept for compatibility with older compilers. We also introduce compatibility code for old compilers that don't define std::unique_ptr
Diffstat (limited to 'src/Core/Unix')
-rw-r--r--src/Core/Unix/CoreService.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Core/Unix/CoreService.cpp b/src/Core/Unix/CoreService.cpp
index 41cc5ec9..b129eff0 100644
--- a/src/Core/Unix/CoreService.cpp
+++ b/src/Core/Unix/CoreService.cpp
@@ -90,7 +90,7 @@ namespace VeraCrypt
{
try
{
- Core = std::move(CoreDirect);
+ Core = move_ptr(CoreDirect);
shared_ptr <Stream> inputStream (new FileStream (inputFD != -1 ? inputFD : InputPipe->GetReadFD()));
shared_ptr <Stream> outputStream (new FileStream (outputFD != -1 ? outputFD : OutputPipe->GetWriteFD()));
@@ -573,8 +573,8 @@ namespace VeraCrypt
byte sync[] = { 0, 0x11, 0x22 };
ServiceInputStream->Write (ConstBufferPtr (sync, array_capacity (sync)));
- AdminInputPipe = std::move(inPipe);
- AdminOutputPipe = std::move(outPipe);
+ AdminInputPipe = move_ptr(inPipe);
+ AdminOutputPipe = move_ptr(outPipe);
}
void CoreService::Stop ()