From f1a596109b18d2d3245b8702fc75524b8da8b9aa Mon Sep 17 00:00:00 2001 From: Mounir IDRASSI Date: Sun, 26 Oct 2014 17:36:54 +0100 Subject: Linux/MacOSX: solve compilation warning by explicitly converting wxCStrData to (const wchar_t*) --- src/Main/TextUserInterface.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src') 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); -- cgit v1.2.3