From 1290e7836f9da9396748b9766175983e359cd75c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20K=C3=B6llhofer?= Date: Sat, 19 Mar 2016 18:59:40 +0100 Subject: Linux/MacOSX: Fix build error when using strict wxWidgets library that doesn't allow implicit conversions. --- src/Main/CommandLineInterface.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/Main/CommandLineInterface.cpp b/src/Main/CommandLineInterface.cpp index 566fdb21..2222b54f 100644 --- a/src/Main/CommandLineInterface.cpp +++ b/src/Main/CommandLineInterface.cpp @@ -401,7 +401,7 @@ namespace VeraCrypt ArgNewKeyfiles = ToKeyfileList (str); if (parser.Found (L"new-password", &str)) - ArgNewPassword = ToUTF8Password (str); + ArgNewPassword = ToUTF8Password (str.c_str()); if (parser.Found (L"new-pim", &str)) { @@ -440,7 +440,7 @@ namespace VeraCrypt { if (Preferences.UseStandardInput) throw_err (L"--password cannot be used with --stdin"); - ArgPassword = ToUTF8Password (str); + ArgPassword = ToUTF8Password (str.c_str()); } if (parser.Found (L"pim", &str)) @@ -481,7 +481,7 @@ namespace VeraCrypt if (parser.Found (L"protection-password", &str)) { - ArgMountOptions.ProtectionPassword = ToUTF8Password (str); + ArgMountOptions.ProtectionPassword = ToUTF8Password (str.c_str()); ArgMountOptions.Protection = VolumeProtection::HiddenVolumeReadOnly; } -- cgit v1.2.3