Merge branch 'master' into 4.x and some warning fixes

2 files changed, 3 insertions, 3 deletions

diff --git a/src/server/shared/Packets/ByteBuffer.cpp b/src/server/shared/Packets/ByteBuffer.cpp
index 2f669f9a428..adb58936c75 100644
--- a/src/server/shared/Packets/ByteBuffer.cpp
+++ b/src/server/shared/Packets/ByteBuffer.cpp
@@ -73,7 +73,7 @@ void BitStream::Print()
     for (uint32 i = 0; i < GetLength(); ++i)
         ss << uint32(GetBit(i)) << " ";
 
-    sLog->outDebug(LOG_FILTER_NETWORKIO, ss.str().c_str());
+    sLog->outDebug(LOG_FILTER_NETWORKIO, "%s", ss.str().c_str());
 }
 
 ByteBuffer::ByteBuffer(size_t res, bool init): _rpos(0), _wpos(0), _bitpos(8), _curbitval(0)
diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
index bf4cf01b2be..ea64fe5434e 100755
--- a/src/server/shared/Packets/ByteBuffer.h
+++ b/src/server/shared/Packets/ByteBuffer.h
@@ -57,7 +57,7 @@ class BitStream
             WriteBits(val, len);
         }
 
-        BitStream(BitStream const& bs) : _rpos(bs._rpos), _wpos(bs._wpos), _data(bs._data) {}
+        BitStream(BitStream const& bs) : _data(bs._data), _rpos(bs._rpos), _wpos(bs._wpos) {}
 
         void Clear();
         uint8 GetBit(uint32 bit);
@@ -104,7 +104,7 @@ class ByteBuffer
 
         // copy constructor
         ByteBuffer(const ByteBuffer &buf) : _rpos(buf._rpos), _wpos(buf._wpos),
-            _storage(buf._storage), _bitpos(buf._bitpos), _curbitval(buf._curbitval)
+            _bitpos(buf._bitpos), _curbitval(buf._curbitval), _storage(buf._storage)
         {
         }