mirror of
https://github.com/MihailRis/voxelcore.git
synced 2026-11-21 09:59:44 +00:00
resolve conflict
This commit is contained in:
parent
369ba4d0be
commit
e3d514c766
1 changed files with 0 additions and 20 deletions
|
|
@ -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,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue