VeraCrypt
aboutsummaryrefslogtreecommitdiff
path: root/src/Main/Forms/PreferencesDialog.cpp
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2016-05-13 19:53:50 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2016-05-13 20:27:16 (GMT)
commit942cf1635a88bd099d9f6108d8c42c15fa0dee0c (patch)
tree832559af3d1fb3023eba9dea72aff936735cba8d /src/Main/Forms/PreferencesDialog.cpp
parent723768137bafb3d75c269f91702fbdf3baa43e15 (diff)
downloadVeraCrypt-942cf1635a88bd099d9f6108d8c42c15fa0dee0c.zip
VeraCrypt-942cf1635a88bd099d9f6108d8c42c15fa0dee0c.tar.gz
Linux: Fix gcc-6 compilation errors.
Diffstat (limited to 'src/Main/Forms/PreferencesDialog.cpp')
-rw-r--r--src/Main/Forms/PreferencesDialog.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Main/Forms/PreferencesDialog.cpp b/src/Main/Forms/PreferencesDialog.cpp
index 3f38c7c..c6f2804 100644
--- a/src/Main/Forms/PreferencesDialog.cpp
+++ b/src/Main/Forms/PreferencesDialog.cpp
@@ -454,11 +454,11 @@ namespace VeraCrypt
libExtension = wxDynamicLibrary::CanonicalizeName (L"x");
#ifdef TC_MACOSX
- extensions.push_back (make_pair (L"dylib", LangString["DLL_FILES"]));
+ extensions.push_back (make_pair (L"dylib", LangString["DLL_FILES"].ToStdWstring()));
#endif
if (!libExtension.empty())
{
- extensions.push_back (make_pair (libExtension.Mid (libExtension.find (L'.') + 1), LangString["DLL_FILES"]));
+ extensions.push_back (make_pair (libExtension.Mid (libExtension.find (L'.') + 1).ToStdWstring(), LangString["DLL_FILES"].ToStdWstring()));
extensions.push_back (make_pair (L"*", L""));
}