projects / libcds.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Renaming cds/cxx11_atomic.h to cds/algo/atomic.h
[libcds.git] / projects / Win / vc12 / cds.vcxproj
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index b6345882d3d51f31b47ce8ca9c782625afe66fd1..36061e799a5b6246a75bbd4a5ac5094ee79724c3 100644 (file)
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -236,7 +236,7 @@
   </PropertyGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">\r
     <ClCompile>\r
-      <AdditionalOptions>/wd4512 /wd4127 %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalOptions>/wd4512 /wd4127 /Zc:inline %(AdditionalOptions)</AdditionalOptions>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -295,7 +295,7 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalOptions>/wd4512 /wd4127 %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalOptions>/wd4512 /wd4127 /Zc:inline %(AdditionalOptions)</AdditionalOptions>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -360,7 +360,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">\r
     <ClCompile>\r
-      <AdditionalOptions>/wd4512 /wd4127 %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalOptions>/wd4512 /wd4127 /Zc:inline %(AdditionalOptions)</AdditionalOptions>\r
       <Optimization>Full</Optimization>\r
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
@@ -460,7 +460,7 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalOptions>/wd4512 /wd4127 %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalOptions>/wd4512 /wd4127 /Zc:inline %(AdditionalOptions)</AdditionalOptions>\r
       <Optimization>Full</Optimization>\r
       <InlineFunctionExpansion>AnySuitable</InlineFunctionExpansion>\r
       <IntrinsicFunctions>true</IntrinsicFunctions>\r
@@ -561,7 +561,7 @@
   </ItemDefinitionGroup>\r
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DebugVLD|Win32'">\r
     <ClCompile>\r
-      <AdditionalOptions>/wd4512 /wd4127 %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalOptions>/wd4512 /wd4127 /Zc:inline %(AdditionalOptions)</AdditionalOptions>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -592,7 +592,7 @@
       <TargetEnvironment>X64</TargetEnvironment>\r
     </Midl>\r
     <ClCompile>\r
-      <AdditionalOptions>/wd4512 /wd4127 %(AdditionalOptions)</AdditionalOptions>\r
+      <AdditionalOptions>/wd4512 /wd4127 /Zc:inline %(AdditionalOptions)</AdditionalOptions>\r
       <Optimization>Disabled</Optimization>\r
       <AdditionalIncludeDirectories>$(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
       <PreprocessorDefinitions>CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions)</PreprocessorDefinitions>\r
@@ -619,12 +619,11 @@
     </Link>\r
   </ItemDefinitionGroup>\r
   <ItemGroup>\r
+    <ClCompile Include="..\..\..\src\dhp_gc.cpp" />\r
     <ClCompile Include="..\..\..\src\dllmain.cpp" />\r
-    <ClCompile Include="..\..\..\src\hrc_gc.cpp" />\r
-    <ClCompile Include="..\..\..\src\hzp_gc.cpp" />\r
+    <ClCompile Include="..\..\..\src\hp_gc.cpp" />\r
     <ClCompile Include="..\..\..\src\init.cpp" />\r
     <ClCompile Include="..\..\..\src\michael_heap.cpp" />\r
-    <ClCompile Include="..\..\..\src\ptb_gc.cpp" />\r
     <ClCompile Include="..\..\..\src\topology_hpux.cpp" />\r
     <ClCompile Include="..\..\..\src\topology_linux.cpp" />\r
     <ClCompile Include="..\..\..\src\topology_osx.cpp" />\r
@@ -632,6 +631,7 @@
     <ClCompile Include="..\..\..\src\urcu_sh.cpp" />\r
   </ItemGroup>\r
   <ItemGroup>\r
+    <ClInclude Include="..\..\..\cds\algo\atomic.h" />\r
     <ClInclude Include="..\..\..\cds\algo\backoff_strategy.h" />\r
     <ClInclude Include="..\..\..\cds\algo\base.h" />\r
     <ClInclude Include="..\..\..\cds\algo\bitop.h" />\r
@@ -668,11 +668,11 @@
     <ClInclude Include="..\..\..\cds\container\details\michael_set_base.h" />\r
     <ClInclude Include="..\..\..\cds\container\details\skip_list_base.h" />\r
     <ClInclude Include="..\..\..\cds\container\details\split_list_base.h" />\r
+    <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_dhp.h" />\r
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_hp.h" />\r
-    <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_ptb.h" />\r
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_map_rcu.h" />\r
+    <ClInclude Include="..\..\..\cds\container\ellen_bintree_set_dhp.h" />\r
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_set_hp.h" />\r
-    <ClInclude Include="..\..\..\cds\container\ellen_bintree_set_ptb.h" />\r
     <ClInclude Include="..\..\..\cds\container\ellen_bintree_set_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\container\impl\ellen_bintree_map.h" />\r
     <ClInclude Include="..\..\..\cds\container\impl\ellen_bintree_set.h" />\r
@@ -693,6 +693,7 @@
     <ClInclude Include="..\..\..\cds\container\michael_map_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\container\michael_set_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\container\mspriority_queue.h" />\r
+    <ClInclude Include="..\..\..\cds\container\skip_list_map_dhp.h" />\r
     <ClInclude Include="..\..\..\cds\container\skip_list_map_hp.h" />\r
     <ClInclude Include="..\..\..\cds\container\skip_list_map_nogc.h" />\r
     <ClInclude Include="..\..\..\cds\container\skip_list_map_rcu.h" />\r
@@ -728,23 +729,20 @@
     <ClInclude Include="..\..\..\cds\container\striped_set\std_list.h" />\r
     <ClInclude Include="..\..\..\cds\container\striped_set\std_set.h" />\r
     <ClInclude Include="..\..\..\cds\container\striped_set\std_vector.h" />\r
-    <ClInclude Include="..\..\..\cds\cxx11_atomic.h" />\r
     <ClInclude Include="..\..\..\cds\details\binary_functor_wrapper.h" />\r
     <ClInclude Include="..\..\..\cds\details\bit_reverse_counter.h" />\r
     <ClInclude Include="..\..\..\cds\details\bounded_container.h" />\r
     <ClInclude Include="..\..\..\cds\details\lib.h" />\r
     <ClInclude Include="..\..\..\cds\details\static_functor.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\all.h" />\r
+    <ClInclude Include="..\..\..\cds\gc\details\dhp.h" />\r
+    <ClInclude Include="..\..\..\cds\gc\details\hp.h" />\r
+    <ClInclude Include="..\..\..\cds\gc\details\hp_alloc.h" />\r
+    <ClInclude Include="..\..\..\cds\gc\details\hp_type.h" />\r
     <ClInclude Include="..\..\..\cds\gc\dhp.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\exception.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\gc_fwd.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\guarded_ptr.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hp_decl.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hp_impl.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hrc_decl.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hrc_impl.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\ptb_decl.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\ptb_impl.h" />\r
+    <ClInclude Include="..\..\..\cds\gc\impl\dhp_decl.h" />\r
+    <ClInclude Include="..\..\..\cds\gc\impl\dhp_impl.h" />\r
+    <ClInclude Include="..\..\..\cds\gc\impl\hp_decl.h" />\r
+    <ClInclude Include="..\..\..\cds\gc\impl\hp_impl.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\basket_queue.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\cuckoo_set.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\details\base.h" />\r
@@ -756,8 +754,8 @@
     <ClInclude Include="..\..\..\cds\intrusive\details\single_link_struct.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\details\skip_list_base.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\details\split_list_base.h" />\r
+    <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_dhp.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_hp.h" />\r
-    <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_ptb.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\ellen_bintree_rcu.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\impl\ellen_bintree.h" />\r
     <ClInclude Include="..\..\..\cds\intrusive\impl\lazy_list.h" />\r
@@ -816,7 +814,6 @@
     <ClInclude Include="..\..\..\cds\urcu\options.h" />\r
     <ClInclude Include="..\..\..\cds\urcu\signal_buffered.h" />\r
     <ClInclude Include="..\..\..\cds\urcu\signal_threaded.h" />\r
-    <ClInclude Include="..\..\..\src\hzp_const.h" />\r
     <ClInclude Include="..\..\..\cds\init.h" />\r
     <ClInclude Include="..\..\..\cds\refcounter.h" />\r
     <ClInclude Include="..\..\..\cds\version.h" />\r
@@ -834,21 +831,7 @@
     <ClInclude Include="..\..\..\cds\details\type_padding.h" />\r
     <ClInclude Include="..\..\..\cds\gc\default_gc.h" />\r
     <ClInclude Include="..\..\..\cds\gc\hp.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hrc.h" />\r
     <ClInclude Include="..\..\..\cds\gc\nogc.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\ptb.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hzp\details\hp_alloc.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hzp\details\hp_fwd.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hzp\details\hp_inline.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hzp\details\hp_retired.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hzp\details\hp_type.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hzp\hzp.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hrc\gc_fwd.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hrc\hrc.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hrc\details\hrc_fwd.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hrc\details\hrc_inline.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\hrc\details\hrc_retired.h" />\r
-    <ClInclude Include="..\..\..\cds\gc\ptb\ptb.h" />\r
     <ClInclude Include="..\..\..\cds\gc\details\retired_ptr.h" />\r
     <ClInclude Include="..\..\..\cds\user_setup\allocator.h" />\r
     <ClInclude Include="..\..\..\cds\user_setup\cache_line.h" />\r
@@ -887,7 +870,6 @@
     <ClInclude Include="..\..\..\cds\compiler\vc\amd64\backoff.h" />\r
     <ClInclude Include="..\..\..\cds\compiler\vc\amd64\bitop.h" />\r
     <ClInclude Include="..\..\..\cds\os\alloc_aligned.h" />\r
-    <ClInclude Include="..\..\..\cds\os\syserror.h" />\r
     <ClInclude Include="..\..\..\cds\os\thread.h" />\r
     <ClInclude Include="..\..\..\cds\os\timer.h" />\r
     <ClInclude Include="..\..\..\cds\os\topology.h" />\r
@@ -898,13 +880,11 @@
     <ClInclude Include="..\..\..\cds\os\linux\timer.h" />\r
     <ClInclude Include="..\..\..\cds\os\linux\topology.h" />\r
     <ClInclude Include="..\..\..\cds\os\posix\alloc_aligned.h" />\r
-    <ClInclude Include="..\..\..\cds\os\posix\syserror.h" />\r
     <ClInclude Include="..\..\..\cds\os\posix\thread.h" />\r
     <ClInclude Include="..\..\..\cds\os\sunos\alloc_aligned.h" />\r
     <ClInclude Include="..\..\..\cds\os\sunos\timer.h" />\r
     <ClInclude Include="..\..\..\cds\os\sunos\topology.h" />\r
     <ClInclude Include="..\..\..\cds\os\win\alloc_aligned.h" />\r
-    <ClInclude Include="..\..\..\cds\os\win\syserror.h" />\r
     <ClInclude Include="..\..\..\cds\os\win\thread.h" />\r
     <ClInclude Include="..\..\..\cds\os\win\timer.h" />\r
     <ClInclude Include="..\..\..\cds\os\win\topology.h" />\r
@@ -977,6 +957,7 @@
     <ClInclude Include="..\..\..\cds\container\details\make_lazy_list.h" />\r
     <ClInclude Include="..\..\..\cds\container\details\make_michael_kvlist.h" />\r
     <ClInclude Include="..\..\..\cds\container\details\make_michael_list.h" />\r
+    <ClInclude Include="..\..\..\src\hp_const.h" />\r
   </ItemGroup>\r
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />\r
   <ImportGroup Label="ExtensionTargets">\r
Unnamed repository; edit this file 'description' to name the repository.