VeraCrypt
aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMounir IDRASSI <mounir.idrassi@idrix.fr>2014-10-26 16:36:54 (GMT)
committerMounir IDRASSI <mounir.idrassi@idrix.fr>2014-11-08 22:24:54 (GMT)
commitf1a596109b18d2d3245b8702fc75524b8da8b9aa (patch)
tree9bc7871ddaebc64c31f5ed3f76f6352046d9398b
parent2c6e9fc15c6467d559cc5e212bd63b02f82640bb (diff)
downloadVeraCrypt-f1a596109b18d2d3245b8702fc75524b8da8b9aa.zip
VeraCrypt-f1a596109b18d2d3245b8702fc75524b8da8b9aa.tar.gz
Linux/MacOSX: solve compilation warning by explicitly converting wxCStrData to (const wchar_t*)
-rw-r--r--src/Main/TextUserInterface.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Main/TextUserInterface.cpp b/src/Main/TextUserInterface.cpp
index b7dffe5..a48470b 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);