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 | |
| parent | 723768137bafb3d75c269f91702fbdf3baa43e15 (diff) | |
| download | VeraCrypt-942cf1635a88bd099d9f6108d8c42c15fa0dee0c.tar.gz VeraCrypt-942cf1635a88bd099d9f6108d8c42c15fa0dee0c.zip | |
Linux: Fix gcc-6 compilation errors.
Diffstat (limited to 'src/Main')
| -rw-r--r-- | src/Main/Forms/PreferencesDialog.cpp | 4 | ||||
| -rw-r--r-- | src/Main/GraphicUserInterface.cpp | 2 | ||||
| -rw-r--r-- | src/Main/Resources.cpp | 8 |
3 files changed, 7 insertions, 7 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"")); } diff --git a/src/Main/GraphicUserInterface.cpp b/src/Main/GraphicUserInterface.cpp index cd5c6fe9..d15e7375 100644 --- a/src/Main/GraphicUserInterface.cpp +++ b/src/Main/GraphicUserInterface.cpp @@ -1599,7 +1599,7 @@ namespace VeraCrypt FilePath GraphicUserInterface::SelectVolumeFile (wxWindow *parent, bool saveMode, const DirectoryPath &directory) const { list < pair <wstring, wstring> > extensions; - extensions.push_back (make_pair (L"tc", LangString["TC_VOLUMES"])); + extensions.push_back (make_pair (L"tc", LangString["TC_VOLUMES"].ToStdWstring())); FilePathList selFiles = Gui->SelectFiles (parent, LangString[saveMode ? "OPEN_NEW_VOLUME" : "OPEN_VOL_TITLE"], saveMode, false, extensions, directory); diff --git a/src/Main/Resources.cpp b/src/Main/Resources.cpp index 8b0dcdfd..fa8d1518 100644 --- a/src/Main/Resources.cpp +++ b/src/Main/Resources.cpp @@ -49,13 +49,13 @@ namespace VeraCrypt strBuf.CopyFrom (res); return string (reinterpret_cast <char *> (strBuf.Ptr())); #else - static const char LanguageXml[] = + static byte LanguageXml[] = { # include "Common/Language.xml.h" , 0 }; - return string (LanguageXml); + return string ((const char*) LanguageXml); #endif } @@ -68,13 +68,13 @@ namespace VeraCrypt strBuf.CopyFrom (res); return string (reinterpret_cast <char *> (strBuf.Ptr())); #else - static const char License[] = + static byte License[] = { # include "License.txt.h" , 0 }; - return string (License); + return string ((const char*) License); #endif } |