Merge branch 'master' of github.com:TrinityCore/TrinityCore into 4.x

This commit is contained in:
Shauren committed 2012-07-04 22:20:21 +02:00
commit ed6f3e2def
360 files changed
+19813 -7203

No files matched your search

+1 -2
View File
@@ -326,8 +326,7 @@ class ByteBuffer
ByteBuffer &operator<<(const char *str)
{
size_t len = 0;
if (str && (len = strlen(str)))
if (size_t len = (str ? strlen(str) : 0))
append((uint8 const*)str, len);
append((uint8)0);
return *this;