Addressing @CaseyCarter's lawyerism

AlexGuteniev · Nov 2, 2021 · 60630ee · 60630ee
1 parent 1a882ba
commit 60630ee
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/stl/inc/mutex b/stl/inc/mutex
@@ -41,7 +41,7 @@ public:
         _Mutex_base(int _Flags = 0) noexcept {
 #if _HAS_CXX20
         if (_STD is_constant_evaluated()) {
-            ::new (static_cast<void*>(&_Mtx_storage)) _Stl_critical_section_constexpr{};
+            new (static_cast<void*>(&_Mtx_storage), _Constexpr_mutex_new_tag_t{}) _Stl_critical_section_constexpr{};
         } else
 #endif // _HAS_CXX20
         {

diff --git a/stl/inc/xthreads.h b/stl/inc/xthreads.h
@@ -135,6 +135,8 @@ inline int _Check_C_return(int _Res) { // throw exception on failure
 }
 _STD_END
 
+struct _Constexpr_mutex_new_tag_t {};
+
 class __declspec(novtable) _Stl_critical_section_interface {
 public:
     virtual void __thiscall _Lock()                     = 0;
@@ -165,6 +167,10 @@ class __declspec(novtable) _Stl_critical_section_constexpr final : public _Stl_c
 
     void __thiscall _Destroy() override {}
 
+    constexpr void* operator new(size_t, void* p, _Constexpr_mutex_new_tag_t) noexcept {
+        return p;
+    }
+
 private:
     _Smtx_t _Mtx;
 };