Core/Random: Use standard aligned operator new and remove RandomEngine singleton instance (it is trivially constructible)

1 files changed, 6 insertions, 10 deletions

diff --git a/src/common/Utilities/SFMTRand.h b/src/common/Utilities/SFMTRand.h
index 7d9a820c487..26c1816f667 100644
--- a/src/common/Utilities/SFMTRand.h
+++ b/src/common/Utilities/SFMTRand.h
@@ -27,16 +27,12 @@
  */
 class SFMTRand {
 public:
-    SFMTRand();
-    uint32 RandomUInt32(); // Output random bits
-    void* operator new(size_t size, std::nothrow_t const&);
-    void operator delete(void* ptr, std::nothrow_t const&);
-    void* operator new(size_t size);
-    void operator delete(void* ptr);
-    void* operator new[](size_t size, std::nothrow_t const&);
-    void operator delete[](void* ptr, std::nothrow_t const&);
-    void* operator new[](size_t size);
-    void operator delete[](void* ptr);
+    SFMTRand() noexcept;
+    uint32 RandomUInt32() noexcept; // Output random bits
+    void* operator new(size_t size) noexcept { return ::operator new (size, std::align_val_t(alignof(SFMTRand)), std::nothrow); }
+    void operator delete(void* ptr) noexcept { ::operator delete (ptr, std::align_val_t(alignof(SFMTRand)), std::nothrow); }
+    void* operator new[](size_t size) noexcept { return ::operator new[](size, std::align_val_t(alignof(SFMTRand)), std::nothrow); }
+    void operator delete[](void* ptr) noexcept { ::operator delete[](ptr, std::align_val_t(alignof(SFMTRand)), std::nothrow); }
 private:
     sfmt_t _state;
 };