backup/barrier
1
0
Fork 0
mirror of https://github.com/debauchee/barrier.git synced 2026-02-12 14:45:21 +08:00
Code Issues Projects Releases Wiki Activity

fixed: win32 warnings.

Browse Source
This commit is contained in:
Nick Bolton
2014-02-25 15:50:06 +00:00
parent c44971b43d
commit 78ecdf4c6e
6 changed files with 37 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/client/CClient.cpp
View File

@@ -800,7 +800,7 @@ CClient::dragInfoReceived(UInt32 fileNum, CString data)
CDragInformation::parseDragInfo(m_dragFileList, fileNum, data);
LOG((CLOG_DEBUG "drag info received, total drag file number: %i", m_dragFileList.size()));
for (int i = 0; i < m_dragFileList.size(); ++i) {
for (size_t i = 0; i < m_dragFileList.size(); ++i) {
LOG((CLOG_DEBUG2 "dragging file %i name: %s", i + 1, m_dragFileList.at(i).c_str()));
}

6
src/lib/io/CCryptoMode.h
View File

@@ -20,14 +20,20 @@
#include "ECryptoMode.h"
#include "CString.h"
#if SYSAPI_UNIX
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wtautological-compare"
#pragma GCC diagnostic ignored "-Wunused-variable"
#pragma GCC diagnostic ignored "-Wunused-function"
#endif
#include <cryptopp562/gcm.h>
#include <cryptopp562/modes.h>
#include <cryptopp562/aes.h>
#if SYSAPI_UNIX
#pragma GCC diagnostic pop
#endif
//! Encapsulation of modes
/*!

5
src/lib/io/CCryptoStream.h
View File

@@ -21,12 +21,17 @@
#include "CStreamFilter.h"
#include "CCryptoMode.h"
#if SYSAPI_UNIX
#pragma GCC diagnostic push
#pragma GCC diagnostic ignored "-Wall"
#endif
#include <cryptopp562/osrng.h>
#include <cryptopp562/sha.h>
#if SYSAPI_UNIX
#pragma GCC diagnostic pop
#endif
class CCryptoOptions;

2
src/lib/server/CServer.cpp
View File

@@ -2350,7 +2350,7 @@ CServer::dragInfoReceived(UInt32 fileNum, CString content)
CDragInformation::parseDragInfo(m_dragFileList, fileNum, content);
LOG((CLOG_DEBUG "drag info received, total drag file number: %i", m_dragFileList.size()));
for (int i = 0; i < m_dragFileList.size(); ++i) {
for (size_t i = 0; i < m_dragFileList.size(); ++i) {
LOG((CLOG_DEBUG "dragging file %i name: %s", i + 1, m_dragFileList.at(i).c_str()));
}

2
src/test/integtests/NetworkTests.cpp
View File

@@ -472,7 +472,7 @@ newMockData(size_t size)
data += headSize;
size_t times = (size - headSize - tailSize) / synergyRocksSize;
for (SInt32 i = 0; i < times; ++i) {
for (size_t i = 0; i < times; ++i) {
memcpy(data, synergyRocks, synergyRocksSize);
data += synergyRocksSize;
}