diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-13 21:53:50 +0200 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2016-05-13 22:27:16 +0200 |
| commit | 942cf1635a88bd099d9f6108d8c42c15fa0dee0c (patch) | |
| tree | 832559af3d1fb3023eba9dea72aff936735cba8d /src/Main/Forms | |
| parent | 723768137bafb3d75c269f91702fbdf3baa43e15 (diff) | |
| download | VeraCrypt-942cf1635a88bd099d9f6108d8c42c15fa0dee0c.tar.gz VeraCrypt-942cf1635a88bd099d9f6108d8c42c15fa0dee0c.zip | |
Linux: Fix gcc-6 compilation errors.
Diffstat (limited to 'src/Main/Forms')
| -rw-r--r-- | src/Main/Forms/PreferencesDialog.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Main/Forms/PreferencesDialog.cpp b/src/Main/Forms/PreferencesDialog.cpp index 3f38c7c0..c6f2804e 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"")); } |