diff options
| author | Per Larsson <[email protected]> | 2022-02-21 15:10:06 +0100 |
|---|---|---|
| committer | Per Larsson <[email protected]> | 2022-02-21 15:10:06 +0100 |
| commit | 75fbf7811d2059d0a9677dd868d3e3f2147b64ae (patch) | |
| tree | 57583f958bfcbb95fb3750f00ed53e5d1d9a176a | |
| parent | Added option to enable websockets. (diff) | |
| download | zen-75fbf7811d2059d0a9677dd868d3e3f2147b64ae.tar.xz zen-75fbf7811d2059d0a9677dd868d3e3f2147b64ae.zip | |
Removed optional offset for GetView.
| -rw-r--r-- | zencore/include/zencore/stream.h | 15 | ||||
| -rw-r--r-- | zenhttp/websocketasio.cpp | 2 |
2 files changed, 3 insertions, 14 deletions
diff --git a/zencore/include/zencore/stream.h b/zencore/include/zencore/stream.h index 54d7e1014..efff2c541 100644 --- a/zencore/include/zencore/stream.h +++ b/zencore/include/zencore/stream.h @@ -37,19 +37,8 @@ public: inline uint64_t GetSize() const { return m_Buffer.size(); } void Reset(); - inline MemoryView GetView(uint64_t Offset = 0) const - { - MemoryView View(m_Buffer.data(), m_Offset); - View.RightChopInline(Offset); - return View; - } - - inline MutableMemoryView GetMutableView(uint64_t Offset = 0) - { - MutableMemoryView View(m_Buffer.data(), m_Offset); - View.RightChopInline(Offset); - return View; - } + inline MemoryView GetView() const { return MemoryView(m_Buffer.data(), m_Offset); } + inline MutableMemoryView GetMutableView() { return MutableMemoryView(m_Buffer.data(), m_Offset); } private: RwLock m_Lock; diff --git a/zenhttp/websocketasio.cpp b/zenhttp/websocketasio.cpp index c2ce7ca64..1a95b12bc 100644 --- a/zenhttp/websocketasio.cpp +++ b/zenhttp/websocketasio.cpp @@ -428,7 +428,7 @@ WebSocketMessageParser::OnParseMessage(MemoryView Msg) if (IsComplete) { - BinaryReader Reader(m_Stream.GetView(WebSocketMessage::HeaderSize)); + BinaryReader Reader(m_Stream.GetView().RightChop(WebSocketMessage::HeaderSize)); CbPackage Pkg; if (Pkg.TryLoad(Reader) == false) |