Fix header file type id definition.

lnd3 · Sep 29, 2024 · a415088 · a415088
1 parent c2d3c98
commit a415088
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/packages/serialization/include/serialization/SerializationBase.h b/packages/serialization/include/serialization/SerializationBase.h
@@ -32,8 +32,9 @@ namespace l::serialization {
 		while (src >> tmp) dst.push_back(tmp);
 	}
 
+	extern const int32_t kHeaderIdentifier;
+
 	struct HeaderValidity {
-		static const int32_t kIdentifier = 0x00defa00; // storage base file identifier
 
 		friend zpp::serializer::access;
 		template <typename Archive, typename Self>
@@ -51,10 +52,10 @@ namespace l::serialization {
 		}
 
 		bool IsIdentifierValid() {
-			return mIdentifier == kIdentifier;
+			return mIdentifier == kHeaderIdentifier;
 		}
 		bool IsVersionValid(int32_t latestVersion) {
-			if (mIdentifier != kIdentifier) {
+			if (mIdentifier != kHeaderIdentifier) {
 				mVersion = mIdentifier; // we might have loaded data without identifier but with version, so check
 			}
 			return mVersion >= 0 && mVersion <= latestVersion;
@@ -151,7 +152,7 @@ namespace l::serialization {
 				*p = self.mLatestVersion;
 
 				if (self.mUseIdentifier) {
-					archive(HeaderValidity::kIdentifier);
+					archive(kHeaderIdentifier);
 				}
 				if (self.mUseVersion) {
 					archive(self.mVersion);
@@ -165,7 +166,7 @@ namespace l::serialization {
 				if (self.mUseIdentifier) {
 					int32_t fileIdentifier;
 					archive(fileIdentifier);
-					ASSERT(fileIdentifier == HeaderValidity::kIdentifier);
+					ASSERT(fileIdentifier == kHeaderIdentifier);
 				}
 				if (self.mUseVersion) {
 					archive(self.mVersion);

diff --git a/packages/serialization/source/common/SerializationBase.cpp b/packages/serialization/source/common/SerializationBase.cpp
@@ -9,5 +9,6 @@
 #include <ctime>
 
 namespace l::serialization {
+	const int32_t kIdentifier = 0x00defa00; // storage base file identifier
 
 }