diff options
Diffstat (limited to 'msvc/projects')
4 files changed, 32 insertions, 267 deletions
diff --git a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj index 8342ab3..2addd29 100644 --- a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj +++ b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj @@ -35,89 +35,33 @@ </ProjectConfiguration> </ItemGroup> <ItemGroup> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\arena.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\assert.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\atomic.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\base.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\bitmap.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\chunk.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\chunk_dss.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\chunk_mmap.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\ckh.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\ctl.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\extent.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\hash.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\huge.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\jemalloc_internal.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\jemalloc_internal_decls.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\jemalloc_internal_defs.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\jemalloc_internal_macros.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\mb.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\mutex.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\nstime.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\pages.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\ph.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\private_namespace.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\private_unnamespace.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\prng.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\prof.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\public_namespace.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\public_unnamespace.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\ql.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\qr.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\quarantine.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\rb.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\rtree.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\size_classes.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\smoothstep.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\spin.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\stats.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\tcache.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\ticker.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\tsd.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\util.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\witness.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_defs.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_macros.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_mangle.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_protos.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_protos_jet.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_rename.h" /> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_typedefs.h" /> - <ClInclude Include="..\..\..\..\include\msvc_compat\C99\stdbool.h" /> - <ClInclude Include="..\..\..\..\include\msvc_compat\C99\stdint.h" /> - <ClInclude Include="..\..\..\..\include\msvc_compat\strings.h" /> - <ClInclude Include="..\..\..\..\include\msvc_compat\windows_extra.h" /> - </ItemGroup> - <ItemGroup> <ClCompile Include="..\..\..\..\src\arena.c" /> - <ClCompile Include="..\..\..\..\src\atomic.c" /> + <ClCompile Include="..\..\..\..\src\background_thread.c" /> <ClCompile Include="..\..\..\..\src\base.c" /> <ClCompile Include="..\..\..\..\src\bitmap.c" /> - <ClCompile Include="..\..\..\..\src\chunk.c" /> - <ClCompile Include="..\..\..\..\src\chunk_dss.c" /> - <ClCompile Include="..\..\..\..\src\chunk_mmap.c" /> <ClCompile Include="..\..\..\..\src\ckh.c" /> <ClCompile Include="..\..\..\..\src\ctl.c" /> <ClCompile Include="..\..\..\..\src\extent.c" /> + <ClCompile Include="..\..\..\..\src\extent_dss.c" /> + <ClCompile Include="..\..\..\..\src\extent_mmap.c" /> <ClCompile Include="..\..\..\..\src\hash.c" /> - <ClCompile Include="..\..\..\..\src\huge.c" /> + <ClCompile Include="..\..\..\..\src\hooks.c" /> <ClCompile Include="..\..\..\..\src\jemalloc.c" /> - <ClCompile Include="..\..\..\..\src\mb.c" /> + <ClCompile Include="..\..\..\..\src\large.c" /> + <ClCompile Include="..\..\..\..\src\malloc_io.c" /> <ClCompile Include="..\..\..\..\src\mutex.c" /> + <ClCompile Include="..\..\..\..\src\mutex_pool.c" /> <ClCompile Include="..\..\..\..\src\nstime.c" /> <ClCompile Include="..\..\..\..\src\pages.c" /> <ClCompile Include="..\..\..\..\src\prng.c" /> <ClCompile Include="..\..\..\..\src\prof.c" /> - <ClCompile Include="..\..\..\..\src\quarantine.c" /> <ClCompile Include="..\..\..\..\src\rtree.c" /> <ClCompile Include="..\..\..\..\src\spin.c" /> <ClCompile Include="..\..\..\..\src\stats.c" /> + <ClCompile Include="..\..\..\..\src\sz.c" /> <ClCompile Include="..\..\..\..\src\tcache.c" /> <ClCompile Include="..\..\..\..\src\ticker.c" /> <ClCompile Include="..\..\..\..\src\tsd.c" /> - <ClCompile Include="..\..\..\..\src\util.c" /> <ClCompile Include="..\..\..\..\src\witness.c" /> </ItemGroup> <PropertyGroup Label="Globals"> @@ -286,7 +230,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>_REENTRANT;_WINDLL;DLLEXPORT;JEMALLOC_DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>JEMALLOC_NO_PRIVATE_NAMESPACE;_REENTRANT;_WINDLL;DLLEXPORT;JEMALLOC_DEBUG;_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings> <ProgramDataBaseFileName>$(OutputPath)$(TargetName).pdb</ProgramDataBaseFileName> @@ -302,7 +246,7 @@ </PrecompiledHeader> <WarningLevel>Level3</WarningLevel> <Optimization>Disabled</Optimization> - <PreprocessorDefinitions>JEMALLOC_DEBUG;_REENTRANT;JEMALLOC_EXPORT=;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>JEMALLOC_NO_PRIVATE_NAMESPACE;JEMALLOC_DEBUG;_REENTRANT;JEMALLOC_EXPORT=;_DEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary> <DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings> @@ -364,7 +308,7 @@ <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> - <PreprocessorDefinitions>_REENTRANT;_WINDLL;DLLEXPORT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>JEMALLOC_NO_PRIVATE_NAMESPACE;_REENTRANT;_WINDLL;DLLEXPORT;NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions> <DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings> <ProgramDataBaseFileName>$(OutputPath)$(TargetName).pdb</ProgramDataBaseFileName> </ClCompile> @@ -383,7 +327,7 @@ <Optimization>MaxSpeed</Optimization> <FunctionLevelLinking>true</FunctionLevelLinking> <IntrinsicFunctions>true</IntrinsicFunctions> - <PreprocessorDefinitions>_REENTRANT;JEMALLOC_EXPORT=;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> + <PreprocessorDefinitions>JEMALLOC_NO_PRIVATE_NAMESPACE;_REENTRANT;JEMALLOC_EXPORT=;NDEBUG;_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions> <AdditionalIncludeDirectories>..\..\..\..\include;..\..\..\..\include\msvc_compat;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories> <RuntimeLibrary>MultiThreaded</RuntimeLibrary> <DisableSpecificWarnings>4090;4146;4267;4334</DisableSpecificWarnings> diff --git a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters index 37f0f02..4edf09b 100644 --- a/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters +++ b/msvc/projects/vc2015/jemalloc/jemalloc.vcxproj.filters @@ -5,189 +5,12 @@ <UniqueIdentifier>{4FC737F1-C7A5-4376-A066-2A32D752A2FF}</UniqueIdentifier> <Extensions>cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx</Extensions> </Filter> - <Filter Include="Header Files"> - <UniqueIdentifier>{93995380-89BD-4b04-88EB-625FBE52EBFB}</UniqueIdentifier> - <Extensions>h;hh;hpp;hxx;hm;inl;inc;xsd</Extensions> - </Filter> - <Filter Include="Header Files\internal"> - <UniqueIdentifier>{5697dfa3-16cf-4932-b428-6e0ec6e9f98e}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\msvc_compat"> - <UniqueIdentifier>{0cbd2ca6-42a7-4f82-8517-d7e7a14fd986}</UniqueIdentifier> - </Filter> - <Filter Include="Header Files\msvc_compat\C99"> - <UniqueIdentifier>{0abe6f30-49b5-46dd-8aca-6e33363fa52c}</UniqueIdentifier> - </Filter> - </ItemGroup> - <ItemGroup> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_defs.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_macros.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_mangle.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_protos.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_protos_jet.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_rename.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\jemalloc_typedefs.h"> - <Filter>Header Files</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\arena.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\assert.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\atomic.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\base.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\bitmap.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\chunk.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\chunk_dss.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\chunk_mmap.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\ckh.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\ctl.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\extent.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\hash.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\huge.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\jemalloc_internal.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\jemalloc_internal_decls.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\jemalloc_internal_defs.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\jemalloc_internal_macros.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\mb.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\mutex.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\nstime.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\pages.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\ph.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\private_namespace.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\private_unnamespace.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\prng.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\prof.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\public_namespace.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\public_unnamespace.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\ql.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\qr.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\quarantine.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\rb.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\rtree.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\size_classes.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\smoothstep.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\spin.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\stats.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\tcache.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\ticker.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\tsd.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\util.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\jemalloc\internal\witness.h"> - <Filter>Header Files\internal</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\msvc_compat\strings.h"> - <Filter>Header Files\msvc_compat</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\msvc_compat\windows_extra.h"> - <Filter>Header Files\msvc_compat</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\msvc_compat\C99\stdbool.h"> - <Filter>Header Files\msvc_compat\C99</Filter> - </ClInclude> - <ClInclude Include="..\..\..\..\include\msvc_compat\C99\stdint.h"> - <Filter>Header Files\msvc_compat\C99</Filter> - </ClInclude> </ItemGroup> <ItemGroup> <ClCompile Include="..\..\..\..\src\arena.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\..\src\atomic.c"> + <ClCompile Include="..\..\..\..\src\background_thread.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="..\..\..\..\src\base.c"> @@ -196,39 +19,42 @@ <ClCompile Include="..\..\..\..\src\bitmap.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\..\src\chunk.c"> - <Filter>Source Files</Filter> - </ClCompile> - <ClCompile Include="..\..\..\..\src\chunk_dss.c"> + <ClCompile Include="..\..\..\..\src\ckh.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\..\src\chunk_mmap.c"> + <ClCompile Include="..\..\..\..\src\ctl.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\..\src\ckh.c"> + <ClCompile Include="..\..\..\..\src\extent.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\..\src\ctl.c"> + <ClCompile Include="..\..\..\..\src\extent_dss.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\..\src\extent.c"> + <ClCompile Include="..\..\..\..\src\extent_mmap.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="..\..\..\..\src\hash.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\..\src\huge.c"> + <ClCompile Include="..\..\..\..\src\hooks.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="..\..\..\..\src\jemalloc.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\..\src\mb.c"> + <ClCompile Include="..\..\..\..\src\large.c"> + <Filter>Source Files</Filter> + </ClCompile> + <ClCompile Include="..\..\..\..\src\malloc_io.c"> <Filter>Source Files</Filter> </ClCompile> <ClCompile Include="..\..\..\..\src\mutex.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\..\..\src\mutex_pool.c"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\..\..\..\src\nstime.c"> <Filter>Source Files</Filter> </ClCompile> @@ -241,9 +67,6 @@ <ClCompile Include="..\..\..\..\src\prof.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\..\src\quarantine.c"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\..\..\src\rtree.c"> <Filter>Source Files</Filter> </ClCompile> @@ -253,6 +76,9 @@ <ClCompile Include="..\..\..\..\src\stats.c"> <Filter>Source Files</Filter> </ClCompile> + <ClCompile Include="..\..\..\..\src\sz.c"> + <Filter>Source Files</Filter> + </ClCompile> <ClCompile Include="..\..\..\..\src\tcache.c"> <Filter>Source Files</Filter> </ClCompile> @@ -262,11 +88,8 @@ <ClCompile Include="..\..\..\..\src\tsd.c"> <Filter>Source Files</Filter> </ClCompile> - <ClCompile Include="..\..\..\..\src\util.c"> - <Filter>Source Files</Filter> - </ClCompile> <ClCompile Include="..\..\..\..\src\witness.c"> <Filter>Source Files</Filter> </ClCompile> </ItemGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/msvc/projects/vc2015/test_threads/test_threads.cpp b/msvc/projects/vc2015/test_threads/test_threads.cpp index a3d1a79..92e3162 100644 --- a/msvc/projects/vc2015/test_threads/test_threads.cpp +++ b/msvc/projects/vc2015/test_threads/test_threads.cpp @@ -16,8 +16,7 @@ using std::thread; using std::uniform_int_distribution; using std::minstd_rand; -int test_threads() -{ +int test_threads() { je_malloc_conf = "narenas:3"; int narenas = 0; size_t sz = sizeof(narenas); diff --git a/msvc/projects/vc2015/test_threads/test_threads_main.cpp b/msvc/projects/vc2015/test_threads/test_threads_main.cpp index ffd96e6..0a022fb 100644 --- a/msvc/projects/vc2015/test_threads/test_threads_main.cpp +++ b/msvc/projects/vc2015/test_threads/test_threads_main.cpp @@ -5,8 +5,7 @@ using namespace std::chrono_literals; -int main(int argc, char** argv) -{ +int main(int argc, char** argv) { int rc = test_threads(); return rc; } |