X-Git-Url: http://plrg.eecs.uci.edu/git/?p=libcds.git;a=blobdiff_plain;f=projects%2FWin%2Fvc12%2Fcds.vcxproj;h=36061e799a5b6246a75bbd4a5ac5094ee79724c3;hp=2c7c36048b9c2a8569cd21cbe08806bb782d84ae;hb=6afa2a21efe16bd4685a652a8766abd92762de65;hpb=f6c63698d567fc5c70556130c5ba9bed9a18d5b6
diff --git a/projects/Win/vc12/cds.vcxproj b/projects/Win/vc12/cds.vcxproj
index 2c7c3604..36061e79 100644
--- a/projects/Win/vc12/cds.vcxproj
+++ b/projects/Win/vc12/cds.vcxproj
@@ -236,7 +236,7 @@
- /wd4512 /wd4127 %(AdditionalOptions)
+ /wd4512 /wd4127 /Zc:inline %(AdditionalOptions)
Disabled
$(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions)
@@ -295,7 +295,7 @@
X64
- /wd4512 /wd4127 %(AdditionalOptions)
+ /wd4512 /wd4127 /Zc:inline %(AdditionalOptions)
Disabled
$(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories)
WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions)
@@ -360,7 +360,7 @@
- /wd4512 /wd4127 %(AdditionalOptions)
+ /wd4512 /wd4127 /Zc:inline %(AdditionalOptions)
Full
AnySuitable
true
@@ -460,7 +460,7 @@
X64
- /wd4512 /wd4127 %(AdditionalOptions)
+ /wd4512 /wd4127 /Zc:inline %(AdditionalOptions)
Full
AnySuitable
true
@@ -561,7 +561,7 @@
- /wd4512 /wd4127 %(AdditionalOptions)
+ /wd4512 /wd4127 /Zc:inline %(AdditionalOptions)
Disabled
$(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories)
CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions)
@@ -592,7 +592,7 @@
X64
- /wd4512 /wd4127 %(AdditionalOptions)
+ /wd4512 /wd4127 /Zc:inline %(AdditionalOptions)
Disabled
$(SolutionDir)..\..\..\;$(BOOST_PATH);%(AdditionalIncludeDirectories)
CDS_USE_VLD;WIN32;_DEBUG;_CONSOLE;_WIN32_WINNT=0x0500;CDS_BUILD_LIB;%(PreprocessorDefinitions)
@@ -619,12 +619,11 @@
+
-
-
+
-
@@ -632,64 +631,75 @@
+
+
-
+
-
-
-
+
-
-
+
+
+
+
-
+
+
+
+
+
+
+
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
-
-
-
+
-
-
-
@@ -719,53 +729,48 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
-
+
-
-
+
-
-
-
@@ -780,6 +785,7 @@
+
@@ -808,12 +814,7 @@
-
-
-
-
-
@@ -823,32 +824,14 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -887,7 +870,6 @@
-
@@ -898,13 +880,11 @@
-
-
@@ -924,80 +904,48 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -1009,6 +957,7 @@
+