From 942cf1635a88bd099d9f6108d8c42c15fa0dee0c Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Fri, 13 May 2016 21:53:50 +0200 Subject: Linux: Fix gcc-6 compilation errors. --- src/Main/Forms/PreferencesDialog.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/Main/Forms') 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"")); } -- cgit v1.2.3