From e3d514c7665d3e94a023a0451a6cd4ca784b5a82 Mon Sep 17 00:00:00 2001 From: MihailRis Date: Sun, 11 Oct 2026 13:07:50 +0300 Subject: [PATCH] resolve conflict --- src/io/memory_ostream.hpp | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/src/io/memory_ostream.hpp b/src/io/memory_ostream.hpp index 3ee853a30..a46043ba8 100644 --- a/src/io/memory_ostream.hpp +++ b/src/io/memory_ostream.hpp @@ -46,26 +46,6 @@ protected: return c; } - pos_type seekoff( - off_type off, - std::ios_base::seekdir way, - std::ios_base::openmode mode = std::ios_base::out - ) override { - // only position query (tellp) is supported - if (off == 0 && way == std::ios_base::cur && - (mode & std::ios_base::out)) { - return pos_type(off_type(size())); - } - return pos_type(off_type(-1)); - } - - std::streamsize xsputn(const char* s, std::streamsize count) override { - reserve(position() + count); - std::memcpy(pptr(), s, count); - advance(count); - return count; - } - pos_type seekoff( off_type off, std::ios_base::seekdir dir,