diff options
| author | Elias Fleckenstein <54945686+EliasFleckenstein03@users.noreply.github.com> | 2020-11-04 16:57:47 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-11-04 16:57:47 +0100 |
| commit | 3e16c3a78fff61c20e63ba730d15e94e3bb877b4 (patch) | |
| tree | c070350db219f2c4241d22bc31949685c7b42fe9 /src/serialization.h | |
| parent | 5d9ae5a91c544fc7fbd475decf47cef7e09ef8fc (diff) | |
| parent | 6ccb5835ff55d85156be91473c598eca9d6cb9a6 (diff) | |
| download | dragonfireclient-3e16c3a78fff61c20e63ba730d15e94e3bb877b4.tar.xz | |
Merge branch 'master' into master
Diffstat (limited to 'src/serialization.h')
| -rw-r--r-- | src/serialization.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/src/serialization.h b/src/serialization.h index b53564c78..f399983c4 100644 --- a/src/serialization.h +++ b/src/serialization.h @@ -77,8 +77,7 @@ with this program; if not, write to the Free Software Foundation, Inc., // in memory; conversion just won't work in this direction. #define SER_FMT_VER_LOWEST_WRITE 24 -inline bool ser_ver_supported(s32 v) -{ +inline bool ser_ver_supported(s32 v) { return v >= SER_FMT_VER_LOWEST_READ && v <= SER_FMT_VER_HIGHEST_READ; } @@ -92,5 +91,5 @@ void decompressZlib(std::istream &is, std::ostream &os, size_t limit = 0); // These choose between zlib and a self-made one according to version void compress(const SharedBuffer<u8> &data, std::ostream &os, u8 version); -// void compress(const std::string &data, std::ostream &os, u8 version); +//void compress(const std::string &data, std::ostream &os, u8 version); void decompress(std::istream &is, std::ostream &os, u8 version); |