Core/Common: Tokenizer -> Trinity::Tokenize (PR: #25327)

1 files changed, 10 insertions, 8 deletions

diff --git a/src/server/shared/Packets/ByteBuffer.h b/src/server/shared/Packets/ByteBuffer.h
index 149545d10d6..50c3c6a24f5 100644
--- a/src/server/shared/Packets/ByteBuffer.h
+++ b/src/server/shared/Packets/ByteBuffer.h
@@ -203,20 +203,22 @@ class TC_SHARED_API ByteBuffer
             return *this;
         }
 
-        ByteBuffer &operator<<(const std::string &value)
+        ByteBuffer &operator<<(std::string_view value)
         {
             if (size_t len = value.length())
-                append((uint8 const*)value.c_str(), len);
-            append((uint8)0);
+                append(reinterpret_cast<uint8 const*>(value.data()), len);
+            append(static_cast<uint8>(0));
             return *this;
         }
 
-        ByteBuffer &operator<<(const char *str)
+        ByteBuffer& operator<<(std::string const& str)
         {
-            if (size_t len = (str ? strlen(str) : 0))
-                append((uint8 const*)str, len);
-            append((uint8)0);
-            return *this;
+            return operator<<(std::string_view(str));
+        }
+
+        ByteBuffer &operator<<(char const* str)
+        {
+            return operator<<(std::string_view(str ? str : ""));
         }
 
         ByteBuffer &operator>>(bool &value)