Fix VS2017 build

From commit Im-dex/xray-162@7c6d8f1
OpenXRay · Aug 4, 2017 · af0a042 · af0a042
1 parent 4417a1b
commit af0a042
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/Layers/xrRender/r__dsgraph_types.h b/src/Layers/xrRender/r__dsgraph_types.h
@@ -43,8 +43,8 @@ class doug_lea_alloc
     void deallocate(pointer p, size_type n) const { g_render_allocator.free_impl((void*&)p); }
     void deallocate(void* p, size_type n) const { g_render_allocator.free_impl(p); }
     char* __charalloc(size_type n) { return (char*)allocate(n); }
-    void construct(pointer p, const T& _Val) { std::_Construct(p, _Val); }
-    void destroy(pointer p) { std::_Destroy(p); }
+    void construct(pointer p, const T& _Val) { new(p) T(_Val); }
+    void destroy(pointer p) { p->~T(); }
     size_type max_size() const
     {
         size_type _Count = (size_type)(-1) / sizeof(T);

diff --git a/src/xrCore/_stl_extensions.h b/src/xrCore/_stl_extensions.h
@@ -108,8 +108,8 @@ class xalloc
     char* _charalloc(size_type n) { return (char*)allocate(n); }
     void deallocate(pointer p, size_type n) const { xr_free(p); }
     void deallocate(void* p, size_type n) const { xr_free(p); }
-    void construct(pointer p, const T& _Val) { std::_Construct(p, _Val); }
-    void destroy(pointer p) { std::_Destroy(p); }
+    void construct(pointer p, const T& _Val) { new(p) T(_Val); }
+    void destroy(pointer p) { p->~T(); }
     size_type max_size() const
     {
         size_type _Count = (size_type)(-1) / sizeof(T);