VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAxel Köllhofer <AxelKoellhofer@web.de>2016-03-19 17:59:40 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-03-20 00:26:28 (GMT)
commit1290e7836f9da9396748b9766175983e359cd75c (patch)
tree3e1b007c96853c1975479741dc42183a300f6d7d
parent646679da4d79bf7f8af22c44c7ae8498086a88a6 (diff)
downloadVeraCrypt-1290e7836f9da9396748b9766175983e359cd75c.zip
VeraCrypt-1290e7836f9da9396748b9766175983e359cd75c.tar.gz
Linux/MacOSX: Fix build error when using strict wxWidgets library that doesn't allow implicit conversions.
-rw-r--r--src/Main/CommandLineInterface.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Main/CommandLineInterface.cpp b/src/Main/CommandLineInterface.cpp
index 566fdb2..2222b54 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;
}