Skip to content

Commit b90501a

Browse files
committed
Merge remote branch 'jl/jl/enable-WX-compile-option'
2 parents 5704fa1 + 8e19c11 commit b90501a

2 files changed

Lines changed: 6 additions & 2 deletions

File tree

PythonScript/project/PythonScript2010.vcxproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,7 @@
122122
<RuntimeLibrary>MultiThreadedDebug</RuntimeLibrary>
123123
<AdditionalIncludeDirectories>../include;../res;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
124124
<MultiProcessorCompilation>true</MultiProcessorCompilation>
125+
<TreatWarningAsError>true</TreatWarningAsError>
125126
</ClCompile>
126127
<Link>
127128
<SubSystem>Windows</SubSystem>

PythonScript/src/stdafx.h

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,15 +45,18 @@
4545
#include <memory>
4646
#include <exception>
4747

48+
/* Warnings disabled because of boost::python
49+
* 4127: Loop/conditional expression is constant
50+
*/
51+
#pragma warning( disable : 4127)
4852
#pragma warning( push )
4953

5054
/* Warnings disabled for boost::python
5155
* 4244: Conversion from long double to double
5256
* 4512: Assignment operator could not be generated
5357
* 4100: Unreferenced local parameter
54-
* 4127: Loop expression is constant
5558
*/
56-
#pragma warning( disable : 4244 4512 4100 4127)
59+
#pragma warning( disable : 4244 4512 4100)
5760
#include <boost/python.hpp>
5861
#pragma warning( pop )
5962

0 commit comments

Comments
 (0)