mirrors
/
VeraCrypt
mirror of https://github.com/veracrypt/VeraCrypt.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Linux: Fix gcc-6 compilation errors.

This commit is contained in:
Mounir IDRASSI 2016-05-13 21:53:50 +02:00
parent 723768137b
commit 942cf1635a
3 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Main/Forms/PreferencesDialog.cpp
View File

@ -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""));
}

2
src/Main/GraphicUserInterface.cpp
View File

@ -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);

8
src/Main/Resources.cpp
View File

@ -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
}