Skip to content

Commit 073f297

Browse files
JeromeMartinezJeromeMartinez
authored
Merge pull request #188 from cjee21/warning
MSVC: Ensure warning suppression does not spread to other files/projects
2 parents db45427 + 71d4421 commit 073f297

5 files changed

Lines changed: 29 additions & 5 deletions

File tree

‎.github/workflows/ZenLib_Checks.yml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ jobs:
99
os: [ubuntu-latest, macos-latest]
1010
fail-fast: false
1111
runs-on: ${{ matrix.os }}
12+
env:
13+
CXXFLAGS: -Werror
1214
steps:
1315
- name: Checkout
1416
uses: actions/checkout@v5

‎Project/MSVC2022/Library/ZenLib.vcxproj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162
<Optimization>Disabled</Optimization>
163163
<LanguageStandard>stdcpp20</LanguageStandard>
164164
<WarningLevel>Level3</WarningLevel>
165+
<SDLCheck>true</SDLCheck>
165166
</ClCompile>
166167
</ItemDefinitionGroup>
167168
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -174,6 +175,7 @@
174175
<Optimization>Disabled</Optimization>
175176
<LanguageStandard>stdcpp20</LanguageStandard>
176177
<WarningLevel>Level3</WarningLevel>
178+
<SDLCheck>true</SDLCheck>
177179
</ClCompile>
178180
</ItemDefinitionGroup>
179181
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -186,6 +188,7 @@
186188
<Optimization>Disabled</Optimization>
187189
<LanguageStandard>stdcpp20</LanguageStandard>
188190
<WarningLevel>Level3</WarningLevel>
191+
<SDLCheck>true</SDLCheck>
189192
</ClCompile>
190193
</ItemDefinitionGroup>
191194
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
@@ -198,6 +201,7 @@
198201
<Optimization>Disabled</Optimization>
199202
<LanguageStandard>stdcpp20</LanguageStandard>
200203
<WarningLevel>Level3</WarningLevel>
204+
<SDLCheck>true</SDLCheck>
201205
</ClCompile>
202206
</ItemDefinitionGroup>
203207
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -210,6 +214,7 @@
210214
<Optimization>Disabled</Optimization>
211215
<LanguageStandard>stdcpp20</LanguageStandard>
212216
<WarningLevel>Level3</WarningLevel>
217+
<SDLCheck>true</SDLCheck>
213218
</ClCompile>
214219
</ItemDefinitionGroup>
215220
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -224,6 +229,7 @@
224229
<ControlFlowGuard>Guard</ControlFlowGuard>
225230
<LanguageStandard>stdcpp20</LanguageStandard>
226231
<WarningLevel>Level3</WarningLevel>
232+
<SDLCheck>true</SDLCheck>
227233
</ClCompile>
228234
</ItemDefinitionGroup>
229235
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -237,6 +243,7 @@
237243
<ControlFlowGuard>Guard</ControlFlowGuard>
238244
<LanguageStandard>stdcpp20</LanguageStandard>
239245
<WarningLevel>Level3</WarningLevel>
246+
<SDLCheck>true</SDLCheck>
240247
</ClCompile>
241248
</ItemDefinitionGroup>
242249
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@@ -252,6 +259,7 @@
252259
<GuardSignedReturns>true</GuardSignedReturns>
253260
<LanguageStandard>stdcpp20</LanguageStandard>
254261
<WarningLevel>Level3</WarningLevel>
262+
<SDLCheck>true</SDLCheck>
255263
</ClCompile>
256264
</ItemDefinitionGroup>
257265
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
@@ -267,6 +275,7 @@
267275
<GuardSignedReturns>true</GuardSignedReturns>
268276
<LanguageStandard>stdcpp20</LanguageStandard>
269277
<WarningLevel>Level3</WarningLevel>
278+
<SDLCheck>true</SDLCheck>
270279
</ClCompile>
271280
</ItemDefinitionGroup>
272281
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -281,6 +290,7 @@
281290
<GuardEHContMetadata>true</GuardEHContMetadata>
282291
<LanguageStandard>stdcpp20</LanguageStandard>
283292
<WarningLevel>Level3</WarningLevel>
293+
<SDLCheck>true</SDLCheck>
284294
</ClCompile>
285295
</ItemDefinitionGroup>
286296
<ItemGroup>

‎Project/MSVC2026/Library/ZenLib.vcxproj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,7 @@
162162
<Optimization>Disabled</Optimization>
163163
<LanguageStandard>stdcpp20</LanguageStandard>
164164
<WarningLevel>Level3</WarningLevel>
165+
<SDLCheck>true</SDLCheck>
165166
</ClCompile>
166167
</ItemDefinitionGroup>
167168
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -174,6 +175,7 @@
174175
<Optimization>Disabled</Optimization>
175176
<LanguageStandard>stdcpp20</LanguageStandard>
176177
<WarningLevel>Level3</WarningLevel>
178+
<SDLCheck>true</SDLCheck>
177179
</ClCompile>
178180
</ItemDefinitionGroup>
179181
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64'">
@@ -186,6 +188,7 @@
186188
<Optimization>Disabled</Optimization>
187189
<LanguageStandard>stdcpp20</LanguageStandard>
188190
<WarningLevel>Level3</WarningLevel>
191+
<SDLCheck>true</SDLCheck>
189192
</ClCompile>
190193
</ItemDefinitionGroup>
191194
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM64EC'">
@@ -198,6 +201,7 @@
198201
<Optimization>Disabled</Optimization>
199202
<LanguageStandard>stdcpp20</LanguageStandard>
200203
<WarningLevel>Level3</WarningLevel>
204+
<SDLCheck>true</SDLCheck>
201205
</ClCompile>
202206
</ItemDefinitionGroup>
203207
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -210,6 +214,7 @@
210214
<Optimization>Disabled</Optimization>
211215
<LanguageStandard>stdcpp20</LanguageStandard>
212216
<WarningLevel>Level3</WarningLevel>
217+
<SDLCheck>true</SDLCheck>
213218
</ClCompile>
214219
</ItemDefinitionGroup>
215220
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
@@ -224,6 +229,7 @@
224229
<ControlFlowGuard>Guard</ControlFlowGuard>
225230
<LanguageStandard>stdcpp20</LanguageStandard>
226231
<WarningLevel>Level3</WarningLevel>
232+
<SDLCheck>true</SDLCheck>
227233
</ClCompile>
228234
</ItemDefinitionGroup>
229235
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -237,6 +243,7 @@
237243
<ControlFlowGuard>Guard</ControlFlowGuard>
238244
<LanguageStandard>stdcpp20</LanguageStandard>
239245
<WarningLevel>Level3</WarningLevel>
246+
<SDLCheck>true</SDLCheck>
240247
</ClCompile>
241248
</ItemDefinitionGroup>
242249
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64'">
@@ -252,6 +259,7 @@
252259
<GuardSignedReturns>true</GuardSignedReturns>
253260
<LanguageStandard>stdcpp20</LanguageStandard>
254261
<WarningLevel>Level3</WarningLevel>
262+
<SDLCheck>true</SDLCheck>
255263
</ClCompile>
256264
</ItemDefinitionGroup>
257265
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM64EC'">
@@ -267,6 +275,7 @@
267275
<GuardSignedReturns>true</GuardSignedReturns>
268276
<LanguageStandard>stdcpp20</LanguageStandard>
269277
<WarningLevel>Level3</WarningLevel>
278+
<SDLCheck>true</SDLCheck>
270279
</ClCompile>
271280
</ItemDefinitionGroup>
272281
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -281,6 +290,7 @@
281290
<GuardEHContMetadata>true</GuardEHContMetadata>
282291
<LanguageStandard>stdcpp20</LanguageStandard>
283292
<WarningLevel>Level3</WarningLevel>
293+
<SDLCheck>true</SDLCheck>
284294
</ClCompile>
285295
</ItemDefinitionGroup>
286296
<ItemGroup>

‎Source/ZenLib/Conf.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -173,11 +173,6 @@
173173
#pragma warning(disable:4786) // MSVC6 doesn't like typenames longer than 255 chars (which generates an enormous amount of warnings).
174174
#endif
175175

176-
//MSVC2005 : "deprecated" warning (replacement functions are not in MinGW32 or Borland!)
177-
#if defined(_MSC_VER) && _MSC_VER >= 1400
178-
#pragma warning(disable : 4996)
179-
#endif
180-
181176
//***************************************************************************
182177
// (Without Namespace)
183178
//***************************************************************************

‎Source/ZenLib/Ztring.cpp‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,13 @@
4949
using namespace std;
5050
//---------------------------------------------------------------------------
5151

52+
//MSVC2005 : "deprecated" warning (replacement functions are not in MinGW32 or Borland!)
53+
#if defined(_MSC_VER) && _MSC_VER >= 1400
54+
#pragma warning(disable : 4996)
55+
#endif
56+
57+
//---------------------------------------------------------------------------
58+
5259
namespace ZenLib
5360
{
5461

0 commit comments

Comments
 (0)