Move reserved_ linkages up to Cytore::Block.

diff --git a/Cytore.hpp b/Cytore.hpp
index db40045982a98ef7f4bf5b696a332742cc8938a9..9f3b4c8f99bfc1b0c647977c33ae17fc135eb1fc 100644 (file)
--- a/Cytore.hpp
+++ b/Cytore.hpp
@@ -52,9 +52,6 @@ struct Header {
     uint32_t reserved_;
 };
 
-struct Block {
-};
-
 template <typename Target_>
 class Offset {
   private:
@@ -85,6 +82,10 @@ class Offset {
     }
 };
 
+struct Block {
+    Cytore::Offset<void> reserved_;
+};
+
 template <typename Type_>
 static _finline Type_ Round(Type_ value, Type_ size) {
     Type_ mask(size - 1);

diff --git a/MobileCydia.mm b/MobileCydia.mm
index 5a091682743efba7a6e16d1efe61b83530e80f7c..9d5c9eb3d515af80ddb7a61816082e79a1aca5fb 100644 (file)
--- a/MobileCydia.mm
+++ b/MobileCydia.mm
@@ -1430,7 +1430,6 @@ typedef std::map< unsigned long, _H<Source> > SourceMap;
 struct PackageValue :
     Cytore::Block
 {
-    Cytore::Offset<void> reserved_;
     Cytore::Offset<PackageValue> next_;
 
     uint32_t index_ : 23;
@@ -1450,7 +1449,6 @@ struct PackageValue :
 struct MetaValue :
     Cytore::Block
 {
-    Cytore::Offset<void> reserved_;
     Cytore::Offset<PackageValue> packages_[1 << 16];
 };