WIP

BeamMW · Dec 11, 2023 · 1cf1fb2 · 1cf1fb2
1 parent e867624
commit 1cf1fb2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/node/processor.h b/node/processor.h
@@ -843,8 +843,7 @@ class NodeProcessor
 				Type m_Value;
 				bool operator < (const Key& x) const { return m_Value < x.m_Value; }
 				IMPLEMENT_GET_PARENT_OBJ(Entry, m_Key)
-			};
-			Key m_Key;
+			} m_Key;
 
 			struct Mru
 				:public boost::intrusive::list_base_hook<>

diff --git a/utility/common.h b/utility/common.h
@@ -55,7 +55,7 @@
 
 #define IMPLEMENT_GET_PARENT_OBJ(parent_class, this_var) \
 	parent_class& get_ParentObj() const { \
-		parent_class*  p = (parent_class*) (((uint8_t*) this) + 1 - (uint8_t*) (&((parent_class*) 1)->this_var)); \
+		parent_class*  p = (parent_class*) (((uint8_t*) this) - offsetof(parent_class, this_var)); \
 		assert(this == &p->this_var); /* this also tests that the variable of the correct type */ \
 		return *p; \
 	}