diff options
| author | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2014-10-26 17:36:54 +0100 |
|---|---|---|
| committer | Mounir IDRASSI <mounir.idrassi@idrix.fr> | 2014-11-08 23:24:54 +0100 |
| commit | f1a596109b18d2d3245b8702fc75524b8da8b9aa (patch) | |
| tree | 9bc7871ddaebc64c31f5ed3f76f6352046d9398b /src | |
| parent | 2c6e9fc15c6467d559cc5e212bd63b02f82640bb (diff) | |
| download | VeraCrypt-f1a596109b18d2d3245b8702fc75524b8da8b9aa.tar.gz VeraCrypt-f1a596109b18d2d3245b8702fc75524b8da8b9aa.zip | |
Linux/MacOSX: solve compilation warning by explicitly converting wxCStrData to (const wchar_t*)
Diffstat (limited to 'src')
| -rw-r--r-- | src/Main/TextUserInterface.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp index b7dffe5d..a48470b1 100644 --- a/src/Main/TextUserInterface.cpp +++ b/src/Main/TextUserInterface.cpp @@ -764,8 +764,8 @@ namespace VeraCrypt ShowString (wxString::Format (L"\rDone: %7.3f%% Speed: %9s Left: %s ", 100.0 - double (options->Size - progress.SizeDone) / (double (options->Size) / 100.0), - speed > 0 ? SpeedToString (speed).c_str() : L" ", - speed > 0 ? TimeSpanToString ((options->Size - progress.SizeDone) / speed).c_str() : L"")); + speed > 0 ? (const wchar_t*) SpeedToString (speed).c_str() : L" ", + speed > 0 ? (const wchar_t*) TimeSpanToString ((options->Size - progress.SizeDone) / speed).c_str() : L"")); } Thread::Sleep (100); |