Skip to content

Commit

Permalink
Part 2 of replacing memory menager. Delete xrMisc.
Browse files Browse the repository at this point in the history
intorr committed Jan 28, 2018

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature.
1 parent d8eb887 commit be39be8
Showing 19 changed files with 1 addition and 262 deletions.
3 changes: 0 additions & 3 deletions src/Layers/xrRenderPC_R1/xrRender_R1.vcxproj
Original file line number Diff line number Diff line change
@@ -472,9 +472,6 @@
<ProjectReference Include="..\..\..\Externals\oalib.vcxproj">
<Project>{61d4856f-fa82-4f02-bb88-909ddfb1fe74}</Project>
</ProjectReference>
<ProjectReference Include="..\..\xrMisc\xrMisc.vcxproj">
<Project>{c964d17a-05a8-4bfa-b0a8-7af5c6b627ec}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
3 changes: 0 additions & 3 deletions src/Layers/xrRenderPC_R2/xrRender_R2.vcxproj
Original file line number Diff line number Diff line change
@@ -519,9 +519,6 @@
<ProjectReference Include="..\..\..\Externals\oalib.vcxproj">
<Project>{61d4856f-fa82-4f02-bb88-909ddfb1fe74}</Project>
</ProjectReference>
<ProjectReference Include="..\..\xrMisc\xrMisc.vcxproj">
<Project>{c964d17a-05a8-4bfa-b0a8-7af5c6b627ec}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
3 changes: 0 additions & 3 deletions src/Layers/xrRenderPC_R3/xrRender_R3.vcxproj
Original file line number Diff line number Diff line change
@@ -567,9 +567,6 @@
<ProjectReference Include="..\..\..\Externals\oalib.vcxproj">
<Project>{61d4856f-fa82-4f02-bb88-909ddfb1fe74}</Project>
</ProjectReference>
<ProjectReference Include="..\..\xrMisc\xrMisc.vcxproj">
<Project>{c964d17a-05a8-4bfa-b0a8-7af5c6b627ec}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
3 changes: 0 additions & 3 deletions src/Layers/xrRenderPC_R4/xrRender_R4.vcxproj
Original file line number Diff line number Diff line change
@@ -578,9 +578,6 @@
<ProjectReference Include="..\..\..\Externals\oalib.vcxproj">
<Project>{61d4856f-fa82-4f02-bb88-909ddfb1fe74}</Project>
</ProjectReference>
<ProjectReference Include="..\..\xrMisc\xrMisc.vcxproj">
<Project>{c964d17a-05a8-4bfa-b0a8-7af5c6b627ec}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
3 changes: 0 additions & 3 deletions src/editors/xrWeatherEditor/pch.hpp
Original file line number Diff line number Diff line change
@@ -8,9 +8,6 @@

#pragma once

// Конфликт при использовании встроенного в движок аллокатора
#define NO_XRNEW

#pragma managed(push, off)
#include "Common/Common.hpp"
#include "xrCommon/inlining_macros.h"
18 changes: 1 addition & 17 deletions src/engine.sln
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 15
VisualStudioVersion = 15.0.27130.2010
VisualStudioVersion = 15.0.27130.2026
MinimumVisualStudioVersion = 14.0.25420.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "utils", "utils", "{89F6A7EE-3BBE-45D3-A8A8-5D9366CD987B}"
EndProject
@@ -175,7 +175,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Common", "Common\Common.vcx
{98D24A3D-7666-4C11-9D6E-B10393CE8CBA} = {98D24A3D-7666-4C11-9D6E-B10393CE8CBA}
{CCCA7859-EB86-493E-9B53-C4235F45B3C5} = {CCCA7859-EB86-493E-9B53-C4235F45B3C5}
{94A1C366-3D19-48E6-8170-4ADC2E70DF97} = {94A1C366-3D19-48E6-8170-4ADC2E70DF97}
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC} = {C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}
{435BAC9A-B225-457D-AB40-C9BD0CC8838C} = {435BAC9A-B225-457D-AB40-C9BD0CC8838C}
{200652A6-043E-4634-8837-87983B3BD5E0} = {200652A6-043E-4634-8837-87983B3BD5E0}
{5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7} = {5535F6B4-7AE6-4B66-8AEA-CC31C14D7AB7}
@@ -213,8 +212,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cryptlib", "..\Externals\cr
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "dummy", "dummy\dummy.vcxproj", "{B5A3098C-C768-45FF-8B6C-1F707C0344F0}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrMisc", "xrMisc\xrMisc.vcxproj", "{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xrMiscMath", "utils\xrMiscMath\xrMiscMath.vcxproj", "{7885CF3C-EE04-4C67-9467-1FBF9A36B037}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libs", "libs", "{49438080-78B8-4056-BDCB-4DACAD652C21}"
@@ -981,18 +978,6 @@ Global
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Mixed|x86.ActiveCfg = Mixed|Win32
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release|x64.ActiveCfg = Release|x64
{B5A3098C-C768-45FF-8B6C-1F707C0344F0}.Release|x86.ActiveCfg = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|x64.ActiveCfg = Debug|x64
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|x64.Build.0 = Debug|x64
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|x86.ActiveCfg = Debug|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Debug|x86.Build.0 = Debug|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|x64.ActiveCfg = Mixed|x64
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|x64.Build.0 = Mixed|x64
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|x86.ActiveCfg = Mixed|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Mixed|x86.Build.0 = Mixed|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|x64.ActiveCfg = Release|x64
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|x64.Build.0 = Release|x64
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|x86.ActiveCfg = Release|Win32
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC}.Release|x86.Build.0 = Release|Win32
{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Debug|x64.ActiveCfg = Debug|x64
{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Debug|x64.Build.0 = Debug|x64
{7885CF3C-EE04-4C67-9467-1FBF9A36B037}.Debug|x86.ActiveCfg = Debug|Win32
@@ -1174,7 +1159,6 @@ Global
{848E8AB3-9962-4C04-B813-5690399C8A3E} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
{61D4856F-FA82-4F02-BB88-909DDFB1FE74} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
{C39F4B46-6E89-4074-902E-CA57073044D2} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
{C964D17A-05A8-4BFA-B0A8-7AF5C6B627EC} = {49438080-78B8-4056-BDCB-4DACAD652C21}
{7885CF3C-EE04-4C67-9467-1FBF9A36B037} = {49438080-78B8-4056-BDCB-4DACAD652C21}
{07CF01C0-B887-499D-AD9C-799CB6A9FE64} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
{DAEF6FB5-4F98-4B34-B049-8828EFEC9250} = {2BFC806B-CE92-4EA4-8FE8-5F2EA54BA348}
1 change: 0 additions & 1 deletion src/xrCore/Memory/XRayAllocator.hpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
#pragma once
#include "memory_allocator_options.h"
#include "xalloc.h"

namespace XRay
8 changes: 0 additions & 8 deletions src/xrCore/Memory/memory_allocator_options.h

This file was deleted.

4 changes: 0 additions & 4 deletions src/xrCore/xrCore.vcxproj
Original file line number Diff line number Diff line change
@@ -311,7 +311,6 @@
<ClInclude Include="Math\MathUtil.hpp" />
<ClInclude Include="math_constants.h" />
<ClInclude Include="Media\Image.hpp" />
<ClInclude Include="Memory\memory_allocator_options.h" />
<ClInclude Include="Memory\xalloc.h" />
<ClInclude Include="Memory\XRayAllocator.hpp" />
<ClInclude Include="net_utils.h" />
@@ -399,9 +398,6 @@
<ProjectReference Include="$(SolutionDir)utils\xrMiscMath\xrMiscMath.vcxproj">
<Project>{7885cf3c-ee04-4c67-9467-1fbf9a36b037}</Project>
</ProjectReference>
<ProjectReference Include="$(SolutionDir)xrMisc\xrMisc.vcxproj">
<Project>{c964d17a-05a8-4bfa-b0a8-7af5c6b627ec}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
3 changes: 0 additions & 3 deletions src/xrCore/xrCore.vcxproj.filters
Original file line number Diff line number Diff line change
@@ -674,9 +674,6 @@
<ClInclude Include="Memory\XRayAllocator.hpp">
<Filter>Memory</Filter>
</ClInclude>
<ClInclude Include="Memory\memory_allocator_options.h">
<Filter>Memory</Filter>
</ClInclude>
<ClInclude Include="Threading\ThreadPool.hpp">
<Filter>Threading</Filter>
</ClInclude>
14 changes: 0 additions & 14 deletions src/xrCore/xrMemory.h
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
#pragma once

#include "Memory/memory_allocator_options.h"
#include "_types.h"

class XRCORE_API xrMemory
@@ -91,17 +90,4 @@ inline void* xr_realloc(void* P, const size_t size) { return Memory.mem_realloc(

XRCORE_API pstr xr_strdup(pcstr string);

// Global new/delete override
#ifndef NO_XRNEW
#if !defined(BUILDING_XRMISC_LIB) && defined(_MSC_VER)
#pragma comment(lib, "xrMisc") // Attempt to force the TU to include our version.
#endif
// XXX: Implementations of operator new/delete are in xrMisc/xrMemory.cpp, since they need
// to be in a static link library.
void* operator new(const size_t size);
void operator delete(void* p);
void* operator new[](const size_t size);
void operator delete[](void* p);
#endif

XRCORE_API void log_vminfo();
3 changes: 0 additions & 3 deletions src/xrEngine/xrEngine.vcxproj
Original file line number Diff line number Diff line change
@@ -460,9 +460,6 @@
<ProjectReference Include="$(xrExternals)luabind.vcxproj">
<Project>{ccd4afae-aa10-42c6-a452-fdee497ccdf1}</Project>
</ProjectReference>
<ProjectReference Include="..\xrMisc\xrMisc.vcxproj">
<Project>{c964d17a-05a8-4bfa-b0a8-7af5c6b627ec}</Project>
</ProjectReference>
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
<ImportGroup Label="ExtensionTargets">
3 changes: 0 additions & 3 deletions src/xrGame/xrGame.vcxproj
Original file line number Diff line number Diff line change
@@ -3819,9 +3819,6 @@
<ProjectReference Include="$(SolutionDir)xrEngine\xrEngine.vcxproj">
<Project>{2578c6d8-660d-48ae-9322-7422f8664f06}</Project>
</ProjectReference>
<ProjectReference Include="$(SolutionDir)xrMisc\xrMisc.vcxproj">
<Project>{c964d17a-05a8-4bfa-b0a8-7af5c6b627ec}</Project>
</ProjectReference>
<ProjectReference Include="$(SolutionDir)xrScriptEngine\xrScriptEngine.vcxproj">
<Project>{132c62de-de85-4978-9675-c78ed4da46f0}</Project>
</ProjectReference>
1 change: 0 additions & 1 deletion src/xrMisc/pch.cpp

This file was deleted.

3 changes: 0 additions & 3 deletions src/xrMisc/pch.hpp

This file was deleted.

144 changes: 0 additions & 144 deletions src/xrMisc/xrMisc.vcxproj

This file was deleted.

29 changes: 0 additions & 29 deletions src/xrMisc/xrMisc.vcxproj.filters

This file was deleted.

1 change: 0 additions & 1 deletion src/xrMisc/xrMisc_readme.txt

This file was deleted.

16 changes: 0 additions & 16 deletions src/xrMisc/xrMisc_xrMemory.cpp

This file was deleted.

0 comments on commit be39be8

Please sign in to comment.