Skip to content

Commit

Permalink
Merge remote-tracking branch 'robux4/memio_write_io'
Browse files Browse the repository at this point in the history
  • Loading branch information
mbunkus committed Feb 24, 2024
2 parents 12d94e0 + d75e9a1 commit 14ca31d
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion ebml/MemIOCallback.h
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class EBML_DLL_API MemIOCallback : public IOCallback
/*!
Use this to write some data from another IOCallback
*/
std::uint32_t write(IOCallback & IOToRead, std::size_t Size);
std::size_t write(IOCallback & IOToRead, std::size_t Size);

bool IsOk() const { return mOk; }
const std::string &GetLastErrorStr() const { return mLastErrorStr; }
Expand Down
2 changes: 1 addition & 1 deletion src/MemIOCallback.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ std::size_t MemIOCallback::write(const void *Buffer, std::size_t Size)
return Size;
}

std::uint32_t MemIOCallback::write(IOCallback & IOToRead, std::size_t Size)
std::size_t MemIOCallback::write(IOCallback & IOToRead, std::size_t Size)
{
if (dataBufferPos + Size < Size) // overflow, we can't hold that much
return 0;
Expand Down

0 comments on commit 14ca31d

Please sign in to comment.