Merge branch 'master' into pr1

TheMostDiligent · web-flow · commit 6615684f4702 · 2025-08-14T09:38:12.000-07:00
diff --git a/Primitives/interface/MemoryAllocator.h b/Primitives/interface/MemoryAllocator.h
@@ -63,7 +63,7 @@ struct IMemoryAllocatorMethods
 {
     void* (*Allocate)       (struct IMemoryAllocator*, size_t Size, const Char* dbgDescription, const char* dbgFileName, const Int32 dbgLineNumber);
     void  (*Free)           (struct IMemoryAllocator*, void* Ptr);
-    void* (*AllocateAligned)(struct IMemoryAllocator*, size_t Size, size_t Alignment, const Char* dbgDescription, const char* dbgFileName, const Int32 dbgLineNumber)
+    void* (*AllocateAligned)(struct IMemoryAllocator*, size_t Size, size_t Alignment, const Char* dbgDescription, const char* dbgFileName, const Int32 dbgLineNumber);
     void  (*FreeAligned)    (struct IMemoryAllocator*, void* Ptr);
 };
 

Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ struct IMemoryAllocatorMethods`
`63`	`63`	`{`
`64`	`64`	`void* (Allocate) (struct IMemoryAllocator, size_t Size, const Char* dbgDescription, const char* dbgFileName, const Int32 dbgLineNumber);`
`65`	`65`	`void (Free) (struct IMemoryAllocator, void* Ptr);`
`66`		`- void* (AllocateAligned)(struct IMemoryAllocator, size_t Size, size_t Alignment, const Char* dbgDescription, const char* dbgFileName, const Int32 dbgLineNumber)`
	`66`	`+ void* (AllocateAligned)(struct IMemoryAllocator, size_t Size, size_t Alignment, const Char* dbgDescription, const char* dbgFileName, const Int32 dbgLineNumber);`
`67`	`67`	`void (FreeAligned) (struct IMemoryAllocator, void* Ptr);`
`68`	`68`	`};`
`69`	`69`