diff options
| author | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-20 00:34:20 +0100 |
|---|---|---|
| committer | Vincent_Michael <Vincent_Michael@gmx.de> | 2013-01-20 00:34:20 +0100 |
| commit | 94944e307239e5ccaabc0f1d88a7da528dbbe508 (patch) | |
| tree | e1961ec3c394b0207eee1061cbe5860d1a9847e3 /src/server/worldserver | |
| parent | c6ef4b104774a04c39d20693349207877cc60e0e (diff) | |
| parent | e524539d90f7c1b3393754641729fa844119b881 (diff) | |
Merge branch 'master' of github.com:TrinityCore/TrinityCore into mmaps
Conflicts:
src/server/game/Movement/MovementGenerators/TargetedMovementGenerator.cpp
Diffstat (limited to 'src/server/worldserver')
| -rw-r--r-- | src/server/worldserver/RemoteAccess/RASocket.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/worldserver/RemoteAccess/RASocket.cpp b/src/server/worldserver/RemoteAccess/RASocket.cpp index 95fdad9ad44..e0f4e7f0de6 100644 --- a/src/server/worldserver/RemoteAccess/RASocket.cpp +++ b/src/server/worldserver/RemoteAccess/RASocket.cpp @@ -71,7 +71,7 @@ int RASocket::send(const std::string& line) ssize_t n = peer().send(line.c_str(), line.length()); #endif // MSG_NOSIGNAL - return n == line.length() ? 0 : -1; + return n == ssize_t(line.length()) ? 0 : -1; } int RASocket::recv_line(ACE_Message_Block& buffer) |