From c10df268719c6f02ef800fb08f0ffd230b07224f Mon Sep 17 00:00:00 2001 From: Martchus Date: Sat, 3 Jul 2021 20:00:58 +0200 Subject: [PATCH] Adapt to versioning changes in reflective rapidjson --- libpkg/data/database.cpp | 19 +++++++++++-------- libpkg/data/database.h | 6 ++++-- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/libpkg/data/database.cpp b/libpkg/data/database.cpp index e1bcba9..7fb99c5 100644 --- a/libpkg/data/database.cpp +++ b/libpkg/data/database.cpp @@ -499,23 +499,26 @@ LIBPKG_EXPORT void pull(LibPkg::PackageSearchResult namespace BinaryReflector { template <> -LIBPKG_EXPORT void writeCustomType(BinarySerializer &serializer, const LibPkg::PackageSearchResult &packageSearchResult) +LIBPKG_EXPORT void writeCustomType( + BinarySerializer &serializer, const LibPkg::PackageSearchResult &packageSearchResult, BinaryVersion version) { if (const auto *const dbInfo = std::get_if(&packageSearchResult.db)) { - serializer.write(dbInfo->name); + serializer.write(dbInfo->name, version); } else if (const auto *const db = std::get(packageSearchResult.db)) { - serializer.write(db->name); + serializer.write(db->name, version); } else { - serializer.write(std::string()); + serializer.write(std::string(), version); } - serializer.write(packageSearchResult.pkg); + serializer.write(packageSearchResult.pkg, version); } template <> -LIBPKG_EXPORT void readCustomType(BinaryDeserializer &deserializer, LibPkg::PackageSearchResult &packageSearchResult) +LIBPKG_EXPORT BinaryVersion readCustomType( + BinaryDeserializer &deserializer, LibPkg::PackageSearchResult &packageSearchResult, BinaryVersion version) { - deserializer.read(packageSearchResult.db.emplace().name); - deserializer.read(packageSearchResult.pkg); + deserializer.read(packageSearchResult.db.emplace().name, version); + deserializer.read(packageSearchResult.pkg, version); + return 0; } } // namespace BinaryReflector diff --git a/libpkg/data/database.h b/libpkg/data/database.h index 9a5424c..1b9ca8c 100644 --- a/libpkg/data/database.h +++ b/libpkg/data/database.h @@ -214,9 +214,11 @@ LIBPKG_EXPORT void pull(LibPkg::PackageSearchResult namespace BinaryReflector { template <> -LIBPKG_EXPORT void writeCustomType(BinarySerializer &serializer, const LibPkg::PackageSearchResult &packageSearchResult); +LIBPKG_EXPORT void writeCustomType( + BinarySerializer &serializer, const LibPkg::PackageSearchResult &packageSearchResult, BinaryVersion version); template <> -LIBPKG_EXPORT void readCustomType(BinaryDeserializer &deserializer, LibPkg::PackageSearchResult &packageSearchResult); +LIBPKG_EXPORT BinaryVersion readCustomType( + BinaryDeserializer &deserializer, LibPkg::PackageSearchResult &packageSearchResult, BinaryVersion version); } // namespace BinaryReflector