* Merge.

--HG--
branch : trunk

1 files changed, 6 insertions, 0 deletions

diff --git a/src/shared/ByteBuffer.h b/src/shared/ByteBuffer.h
index 97b6c1cbd17..801270fa711 100644
--- a/src/shared/ByteBuffer.h
+++ b/src/shared/ByteBuffer.h
@@ -228,6 +228,12 @@ class ByteBuffer
             _rpos += sizeof(T);
             return r;
         };
+        template<> std::string read<std::string>()
+        {
+            std::string tmp;
+            *this >> tmp;
+            return tmp;
+        }
         template <typename T> T read(size_t pos) const
         {
             ASSERT(pos + sizeof(T) <= size() || PrintPosError(false,pos,sizeof(T)));