ilikecats/stk-code_catmod
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'refactor-network-string' of https://github.com/supertuxkart/stk-code into refactor-network-string

Browse Source
This commit is contained in:
hiker 2016-03-01 11:55:57 +11:00
commit d086501035
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/network/network_string.cpp
View File

@ -135,7 +135,7 @@ std::string BareNetworkString::getLogMessage() const
{
oss << "0x" << std::hex << std::setw(3) << std::setfill('0')
<< line << " | ";
unsigned int upper_limit = std::min(line+16, m_buffer.size());
unsigned int upper_limit = std::min(line+16, (unsigned int)m_buffer.size());
for(unsigned int i=line; i<upper_limit; i++)
{
oss << std::hex << std::setfill('0') << std::setw(2)

2
src/network/protocol.hpp
View File

@ -27,6 +27,8 @@
#include "utils/no_copy.hpp"
#include "utils/types.hpp"
#include <stddef.h>
class Event;
class NetworkString;
class STKPeer;