Author: futatuki
Date: Fri Oct 11 12:27:26 2019
New Revision: 1868290
URL: http://svn.apache.org/viewvc?rev=1868290&view=rev
Log:
On branch swig-py3: Bring C4115 back to warning status to fix compilation
issue with Python 3, derived from including Python.h, in the generated
swig python code and our support code.
* build/generator/templates/vcnet_vcproj.ezt: Remove compile option to
treat C4115 as an error from "AdditionalOptions".
* build/generator/templates/vcnet_vcxproj.ezt: Remove C4115 from list of
warnings to treat as an error.
Tested by: jcorvel
Modified:
subversion/branches/swig-py3/build/generator/templates/vcnet_vcproj.ezt
subversion/branches/swig-py3/build/generator/templates/vcnet_vcxproj.ezt
Modified:
subversion/branches/swig-py3/build/generator/templates/vcnet_vcproj.ezt
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/generator/templates/vcnet_vcproj.ezt?rev=1868290&r1=1868289&r2=1868290&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/generator/templates/vcnet_vcproj.ezt
(original)
+++ subversion/branches/swig-py3/build/generator/templates/vcnet_vcproj.ezt Fri
Oct 11 12:27:26 2019
@@ -60,7 +60,7 @@
DisableSpecificWarnings="4100;4127;4206;4512;4701;4706;4800"
Detect64BitPortabilityProblems="FALSE"
AdditionalOptions="
- /we4002 /we4003 /we4013 /we4020 /we4022 /we4024
/we4028 /we4029 /we4030 /we4031 /we4033 /we4047 /we4089 /we4113 /we4115 /we4204
/we4715"
+ /we4002 /we4003 /we4013 /we4020 /we4022 /we4024
/we4028 /we4029 /we4030 /we4031 /we4033 /we4047 /we4089 /we4113 /we4204 /we4715"
DebugInformationFormat="3"
ProgramDataBaseFileName="$(IntDir)\[target.output_pdb]"
[if-any
configs.forced_include_files]ForcedIncludeFiles="[for
configs.forced_include_files][configs.forced_include_files][if-index
configs.forced_include_files last][else];[end][end]"
Modified:
subversion/branches/swig-py3/build/generator/templates/vcnet_vcxproj.ezt
URL:
http://svn.apache.org/viewvc/subversion/branches/swig-py3/build/generator/templates/vcnet_vcxproj.ezt?rev=1868290&r1=1868289&r2=1868290&view=diff
==============================================================================
--- subversion/branches/swig-py3/build/generator/templates/vcnet_vcxproj.ezt
(original)
+++ subversion/branches/swig-py3/build/generator/templates/vcnet_vcxproj.ezt
Fri Oct 11 12:27:26 2019
@@ -65,7 +65,7 @@
<WarningLevel>Level4</WarningLevel>
<DebugInformationFormat>ProgramDatabase</DebugInformationFormat>
<DisableSpecificWarnings>4100;4127;4206;4512;4701;4706;4800;%(DisableSpecificWarnings)</DisableSpecificWarnings>
-
<TreatSpecificWarningsAsErrors>4002;4003;4013;4020;4022;4024;4028;4029;4030;4031;4033;4047;4089;4113;4115;4133;4204;4700;4715;4789;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
+
<TreatSpecificWarningsAsErrors>4002;4003;4013;4020;4022;4024;4028;4029;4030;4031;4033;4047;4089;4113;4133;4204;4700;4715;4789;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
[if-any configs.forced_include_files] <ForcedIncludeFiles>[for
configs.forced_include_files][configs.forced_include_files];[end]%(ForcedIncludeFiles)</ForcedIncludeFiles>
[end] </ClCompile>
<ResourceCompile>
