From 9cd8023e92b1df810f86a405cd89045e865a4afc Mon Sep 17 00:00:00 2001 From: Nick Bolton Date: Wed, 10 Apr 2013 15:04:14 +0000 Subject: [PATCH] fixed windows 64-bit warnings. --- src/lib/synergy/CCryptoStream.cpp | 4 ++-- src/lib/synergy/CDaemonApp.cpp | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/lib/synergy/CCryptoStream.cpp b/src/lib/synergy/CCryptoStream.cpp index d5111eea..e2e3b7e6 100644 --- a/src/lib/synergy/CCryptoStream.cpp +++ b/src/lib/synergy/CCryptoStream.cpp @@ -38,10 +38,10 @@ CCryptoStream::CCryptoStream( m_key = new byte[kKeyLength]; if (!options.m_pass.empty()) { - createKey(m_key, options.m_pass, kKeyLength, options.m_pass.length()); + createKey(m_key, options.m_pass, kKeyLength, static_cast(options.m_pass.length())); byte iv[CRYPTO_IV_SIZE]; - createKey(iv, options.m_pass, CRYPTO_IV_SIZE, options.m_pass.length() * 2); + createKey(iv, options.m_pass, CRYPTO_IV_SIZE, static_cast(options.m_pass.length()) * 2); setIv(iv); } } diff --git a/src/lib/synergy/CDaemonApp.cpp b/src/lib/synergy/CDaemonApp.cpp index d7edc7bc..45e381ba 100644 --- a/src/lib/synergy/CDaemonApp.cpp +++ b/src/lib/synergy/CDaemonApp.cpp @@ -300,10 +300,10 @@ CDaemonApp::handleIpcMessage(const CEvent& e, void*) LOG((CLOG_DEBUG "new command, elevate=%d command=%s", cm->elevate(), command.c_str())); CString debugArg("--debug"); - int debugArgPos = command.find(debugArg); + UInt32 debugArgPos = static_cast(command.find(debugArg)); if (debugArgPos != CString::npos) { - int from = debugArgPos + debugArg.size() + 1; - int nextSpace = command.find(" ", from); + UInt32 from = debugArgPos + static_cast(debugArg.size()) + 1; + UInt32 nextSpace = static_cast(command.find(" ", from)); CString logLevel(command.substr(from, nextSpace - from)); try {