Replace std::unique_ptr with xr_unique_ptr

Author: FreeZoneMods

src/Common/Common.vcxproj

@@ -180,6 +180,7 @@
     <ClInclude Include="..\xrCommon\xr_list.h" />
     <ClInclude Include="..\xrCommon\xr_map.h" />
     <ClInclude Include="..\xrCommon\xr_set.h" />
+    <ClInclude Include="..\xrCommon\xr_smart_pointers.h" />
     <ClInclude Include="..\xrCommon\xr_stack.h" />
     <ClInclude Include="..\xrCommon\xr_string.h" />
     <ClInclude Include="..\xrCommon\xr_unordered_map.h" />

src/Common/Common.vcxproj.filters

@@ -85,6 +85,9 @@
     <ClInclude Include="..\xrCommon\xr_array.h">
       <Filter>xrCommon</Filter>
     </ClInclude>
+    <ClInclude Include="..\xrCommon\xr_smart_pointers.h">
+      <Filter>xrCommon</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Filter Include="NvMender2003">

src/editors/ECore/stdafx.h

@@ -108,6 +108,7 @@ typedef TMsgDlgBtn TMsgDlgButtons[mbHelp];
 #include "xrCore/xr_token.h"
 #include "xrCommon/xr_vector.h"
 #include "xrCommon/xr_string.h"
+#include "xrCommon/xr_smart_pointers.h"
 #include "xrCore/Animation/Bone.hpp"
 #include "xrCore/Animation/Motion.hpp"
 

src/xrCommon/xr_smart_pointers.h

@@ -0,0 +1,21 @@
+#pragma once
+
+#include <memory>
+
+template <typename T>
+using xr_unique_ptr = std::unique_ptr<T>;
+
+template <typename T>
+using xr_shared_ptr = std::shared_ptr<T>;
+
+template <class T, class... Args>
+inline xr_unique_ptr<T> xr_make_unique(Args&&... args)
+{
+    return std::make_unique<T>(args...);
+}
+
+template <class T, class... Args>
+inline xr_shared_ptr<T> xr_make_shared(Args&&... args)
+{
+    return std::make_shared<T>(args...);
+}

src/xrCore/FileSystem.cpp

@@ -11,7 +11,7 @@
 #include "vfw.h"
 #endif
 
-std::unique_ptr<EFS_Utils> xr_EFS;
+xr_unique_ptr<EFS_Utils> xr_EFS;
 //----------------------------------------------------
 EFS_Utils::EFS_Utils() {}
 EFS_Utils::~EFS_Utils() {}

src/xrCore/FileSystem.h

@@ -42,7 +42,7 @@ class XRCORE_API EFS_Utils
     static xr_string ExtractFileExt(LPCSTR src);
     static xr_string ExcludeBasePath(LPCSTR full_path, LPCSTR excl_path);
 };
-extern XRCORE_API std::unique_ptr<EFS_Utils> xr_EFS;
+extern XRCORE_API xr_unique_ptr<EFS_Utils> xr_EFS;
 #define EFS (*xr_EFS)
 
 #endif /*_INCDEF_FileSystem_H_*/

src/xrCore/LocatorAPI.cpp

@@ -26,7 +26,7 @@
 
 const u32 BIG_FILE_READER_WINDOW_SIZE = 1024 * 1024;
 
-std::unique_ptr<CLocatorAPI> xr_FS;
+xr_unique_ptr<CLocatorAPI> xr_FS;
 
 #ifdef _EDITOR
 static constexpr pcstr FSLTX = "fs.ltx"

src/xrCore/LocatorAPI.h

@@ -10,6 +10,7 @@
 #include "LocatorAPI_defs.h"
 //#include "xrCore/Threading/Lock.hpp"
 #include "xrCommon/xr_map.h"
+#include "xrCommon/xr_smart_pointers.h"
 #include "xrCommon/predicates.h"
 #include "Common/Noncopyable.hpp"
 
@@ -255,5 +256,5 @@ class XRCORE_API CLocatorAPI : Noncopyable
     void unlock_rescan();
 };
 
-extern XRCORE_API std::unique_ptr<CLocatorAPI> xr_FS;
+extern XRCORE_API xr_unique_ptr<CLocatorAPI> xr_FS;
 #define FS (*xr_FS)

src/xrCore/ModuleLookup.hpp

@@ -1,5 +1,5 @@
 #pragma once
-#include <memory>
+#include "xrCommon/xr_smart_pointers.h"
 
 namespace XRay
 {
@@ -23,15 +23,15 @@ class XRCORE_API ModuleHandle
     void* GetProcAddress(pcstr procName) const;
 };
 
-using Module = std::unique_ptr<ModuleHandle>;
+using Module = xr_unique_ptr<ModuleHandle>;
 
 inline auto LoadModule(bool dontUnload = false)
 {
-    return std::make_unique<ModuleHandle>(dontUnload);
+    return xr_make_unique<ModuleHandle>(dontUnload);
 }
 
 inline auto LoadModule(pcstr moduleName, bool dontUnload = false)
 {
-    return std::make_unique<ModuleHandle>(moduleName, dontUnload);
+    return xr_make_unique<ModuleHandle>(moduleName, dontUnload);
 }
 }

src/xrCore/Threading/ThreadPool.hpp

@@ -15,7 +15,7 @@
 #include <mutex>
 #include <condition_variable>
 #include <functional>
-#include <memory>
+#include "xrCommon/xr_smart_pointers.h"
 
 class XRCORE_API Thread
 {
@@ -42,7 +42,7 @@ class XRCORE_API Thread
 class ThreadPool
 {
 public:
-    xr_vector<std::unique_ptr<Thread>> threads;
+    xr_vector<xr_unique_ptr<Thread>> threads;
 
     void initialize()
     {