Petr Onderka has uploaded a new change for review. https://gerrit.wikimedia.org/r/83789
Change subject: Fixed compilation on Linux by moving constants to .cpp ...................................................................... Fixed compilation on Linux by moving constants to .cpp Change-Id: I76cec79142f3b2a85e36b8e61c8a780dc061dd66 --- M DumpObjects/FileHeader.cpp M DumpObjects/FileHeader.h 2 files changed, 6 insertions(+), 4 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/dumps/incremental refs/changes/89/83789/1 diff --git a/DumpObjects/FileHeader.cpp b/DumpObjects/FileHeader.cpp index d41a6e2..5973f26 100644 --- a/DumpObjects/FileHeader.cpp +++ b/DumpObjects/FileHeader.cpp @@ -4,6 +4,8 @@ #include "../DumpException.h" const std::string FileHeader::MagicNumber = "MWID"; +const std::uint8_t FileHeader::FileFormatVersion = 1; +const std::uint8_t FileHeader::FileDataVersion = 1; FileHeader::FileHeader( DumpKind kind, @@ -84,4 +86,4 @@ FileHeader::FileHeader(std::weak_ptr<WritableDump> dump) : DumpObject(dump), FileEnd(Length()), PageIdIndexRoot(0), RevisionIdIndexRoot(0), TextGroupIdIndexRoot(0), ModelFormatIndexRoot(0), FreeSpaceIndexRoot(0), SiteInfo(0) -{} \ No newline at end of file +{} diff --git a/DumpObjects/FileHeader.h b/DumpObjects/FileHeader.h index 8edfc20..137c524 100644 --- a/DumpObjects/FileHeader.h +++ b/DumpObjects/FileHeader.h @@ -21,8 +21,8 @@ void WriteInternal(); public: static const std::string MagicNumber; - static const std::uint8_t FileFormatVersion = 1; - static const std::uint8_t FileDataVersion = 1; + static const std::uint8_t FileFormatVersion; + static const std::uint8_t FileDataVersion; static FileHeader Read(ReadableDump const &dump); @@ -40,4 +40,4 @@ Offset SiteInfo; FileHeader(std::weak_ptr<WritableDump> dump = std::weak_ptr<WritableDump>()); -}; \ No newline at end of file +}; -- To view, visit https://gerrit.wikimedia.org/r/83789 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I76cec79142f3b2a85e36b8e61c8a780dc061dd66 Gerrit-PatchSet: 1 Gerrit-Project: operations/dumps/incremental Gerrit-Branch: gsoc Gerrit-Owner: Petr Onderka <gsv...@gmail.com> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits