mirror of
https://github.com/veracrypt/VeraCrypt.git
synced 2026-06-09 22:36:59 -05:00
Prepare for changes in wxWidgets 3.3 (#1343)
* Move from deprecated wxScopedPtr to std::unique_ptr wxScopedPtr was included previously through some header hierarchy which as of 3.3 is no longer the case causing it to break. But instead of including a header for a deprecated function explicitly, just move to std::unique_ptr as recommended by upstream. * Convert to explicit conversions from wxString As of https://github.com/wxWidgets/wxWidgets/pull/23449/commits/35c35c235e9c29b40002131602e050dca8d65b8c wxWidgets defaults to STL classes, which has a side-effect that some implicit conversions break. This patch converts those conversions to explicit in anticipation of wxWidgets 3.3 release.
This commit is contained in:
@@ -975,7 +975,7 @@ namespace VeraCrypt
|
||||
if (OuterVolume && VolumeSize > TC_MAX_FAT_SECTOR_COUNT * SectorSize)
|
||||
{
|
||||
uint64 limit = TC_MAX_FAT_SECTOR_COUNT * SectorSize / BYTES_PER_TB;
|
||||
wstring err = StringFormatter (LangString["LINUX_ERROR_SIZE_HIDDEN_VOL"], limit, limit * 1024);
|
||||
wstring err = static_cast<wstring>(StringFormatter (LangString["LINUX_ERROR_SIZE_HIDDEN_VOL"], limit, limit * 1024));
|
||||
|
||||
if (SectorSize < 4096)
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user