Skip to content

Commit a1e259e

Browse files
AzothAmmoAzothAmmo
committed
Use /W4 in all but performance.
Ignore VS warning 4127 for assert(false) in RapidJSON
1 parent 8401da0 commit a1e259e

File tree

7 files changed

+43
-37
lines changed

7 files changed

+43
-37
lines changed

‎include/cereal/external/rapidjson/istreamwrapper.h

+1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@ CEREAL_RAPIDJSON_DIAG_OFF(padded)
2323
#ifdef _MSC_VER
2424
CEREAL_RAPIDJSON_DIAG_PUSH
2525
CEREAL_RAPIDJSON_DIAG_OFF(4351) // new behavior: elements of array 'array' will be default initialized
26+
CEREAL_RAPIDJSON_DIAG_OFF(4127) // ignore assert(false) for triggering exception
2627
#endif
2728

2829
CEREAL_RAPIDJSON_NAMESPACE_BEGIN

‎include/cereal/external/rapidjson/memorystream.h

+6-1
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,11 @@ CEREAL_RAPIDJSON_DIAG_OFF(unreachable-code)
2323
CEREAL_RAPIDJSON_DIAG_OFF(missing-noreturn)
2424
#endif
2525

26+
#ifdef _MSC_VER
27+
CEREAL_RAPIDJSON_DIAG_PUSH
28+
CEREAL_RAPIDJSON_DIAG_OFF( 4127 ) // ignore assert(false) for triggering exception
29+
#endif
30+
2631
CEREAL_RAPIDJSON_NAMESPACE_BEGIN
2732

2833
//! Represents an in-memory input byte stream.
@@ -64,7 +69,7 @@ struct MemoryStream {
6469

6570
CEREAL_RAPIDJSON_NAMESPACE_END
6671

67-
#ifdef __clang__
72+
#if defined(__clang__) || defined(_MSC_VER)
6873
CEREAL_RAPIDJSON_DIAG_POP
6974
#endif
7075

‎vs2013/sandbox/sandbox.vcxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -154,7 +154,7 @@
154154
</PropertyGroup>
155155
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
156156
<ClCompile>
157-
<WarningLevel>Level3</WarningLevel>
157+
<WarningLevel>Level4</WarningLevel>
158158
<Optimization>Disabled</Optimization>
159159
<SDLCheck>true</SDLCheck>
160160
</ClCompile>
@@ -164,7 +164,7 @@
164164
</ItemDefinitionGroup>
165165
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
166166
<ClCompile>
167-
<WarningLevel>Level3</WarningLevel>
167+
<WarningLevel>Level4</WarningLevel>
168168
<Optimization>Disabled</Optimization>
169169
<SDLCheck>true</SDLCheck>
170170
</ClCompile>
@@ -174,7 +174,7 @@
174174
</ItemDefinitionGroup>
175175
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
176176
<ClCompile>
177-
<WarningLevel>Level3</WarningLevel>
177+
<WarningLevel>Level4</WarningLevel>
178178
<Optimization>Disabled</Optimization>
179179
<SDLCheck>true</SDLCheck>
180180
</ClCompile>
@@ -184,7 +184,7 @@
184184
</ItemDefinitionGroup>
185185
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
186186
<ClCompile>
187-
<WarningLevel>Level3</WarningLevel>
187+
<WarningLevel>Level4</WarningLevel>
188188
<Optimization>Disabled</Optimization>
189189
<SDLCheck>true</SDLCheck>
190190
</ClCompile>
@@ -194,7 +194,7 @@
194194
</ItemDefinitionGroup>
195195
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
196196
<ClCompile>
197-
<WarningLevel>Level3</WarningLevel>
197+
<WarningLevel>Level4</WarningLevel>
198198
<Optimization>MaxSpeed</Optimization>
199199
<FunctionLevelLinking>true</FunctionLevelLinking>
200200
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -208,7 +208,7 @@
208208
</ItemDefinitionGroup>
209209
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
210210
<ClCompile>
211-
<WarningLevel>Level3</WarningLevel>
211+
<WarningLevel>Level4</WarningLevel>
212212
<Optimization>MaxSpeed</Optimization>
213213
<FunctionLevelLinking>true</FunctionLevelLinking>
214214
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -222,7 +222,7 @@
222222
</ItemDefinitionGroup>
223223
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
224224
<ClCompile>
225-
<WarningLevel>Level3</WarningLevel>
225+
<WarningLevel>Level4</WarningLevel>
226226
<Optimization>MaxSpeed</Optimization>
227227
<FunctionLevelLinking>true</FunctionLevelLinking>
228228
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -237,7 +237,7 @@
237237
</ItemDefinitionGroup>
238238
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
239239
<ClCompile>
240-
<WarningLevel>Level3</WarningLevel>
240+
<WarningLevel>Level4</WarningLevel>
241241
<Optimization>MaxSpeed</Optimization>
242242
<FunctionLevelLinking>true</FunctionLevelLinking>
243243
<IntrinsicFunctions>true</IntrinsicFunctions>

‎vs2013/sandbox_json/sandbox_json.vcxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@
148148
</PropertyGroup>
149149
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
150150
<ClCompile>
151-
<WarningLevel>Level3</WarningLevel>
151+
<WarningLevel>Level4</WarningLevel>
152152
<Optimization>Disabled</Optimization>
153153
<SDLCheck>true</SDLCheck>
154154
</ClCompile>
@@ -158,7 +158,7 @@
158158
</ItemDefinitionGroup>
159159
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
160160
<ClCompile>
161-
<WarningLevel>Level3</WarningLevel>
161+
<WarningLevel>Level4</WarningLevel>
162162
<Optimization>Disabled</Optimization>
163163
<SDLCheck>true</SDLCheck>
164164
</ClCompile>
@@ -168,7 +168,7 @@
168168
</ItemDefinitionGroup>
169169
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
170170
<ClCompile>
171-
<WarningLevel>Level3</WarningLevel>
171+
<WarningLevel>Level4</WarningLevel>
172172
<Optimization>Disabled</Optimization>
173173
<SDLCheck>true</SDLCheck>
174174
</ClCompile>
@@ -178,7 +178,7 @@
178178
</ItemDefinitionGroup>
179179
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
180180
<ClCompile>
181-
<WarningLevel>Level3</WarningLevel>
181+
<WarningLevel>Level4</WarningLevel>
182182
<Optimization>Disabled</Optimization>
183183
<SDLCheck>true</SDLCheck>
184184
</ClCompile>
@@ -188,7 +188,7 @@
188188
</ItemDefinitionGroup>
189189
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
190190
<ClCompile>
191-
<WarningLevel>Level3</WarningLevel>
191+
<WarningLevel>Level4</WarningLevel>
192192
<Optimization>MaxSpeed</Optimization>
193193
<FunctionLevelLinking>true</FunctionLevelLinking>
194194
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -202,7 +202,7 @@
202202
</ItemDefinitionGroup>
203203
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
204204
<ClCompile>
205-
<WarningLevel>Level3</WarningLevel>
205+
<WarningLevel>Level4</WarningLevel>
206206
<Optimization>MaxSpeed</Optimization>
207207
<FunctionLevelLinking>true</FunctionLevelLinking>
208208
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -216,7 +216,7 @@
216216
</ItemDefinitionGroup>
217217
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
218218
<ClCompile>
219-
<WarningLevel>Level3</WarningLevel>
219+
<WarningLevel>Level4</WarningLevel>
220220
<Optimization>MaxSpeed</Optimization>
221221
<FunctionLevelLinking>true</FunctionLevelLinking>
222222
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -230,7 +230,7 @@
230230
</ItemDefinitionGroup>
231231
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
232232
<ClCompile>
233-
<WarningLevel>Level3</WarningLevel>
233+
<WarningLevel>Level4</WarningLevel>
234234
<Optimization>MaxSpeed</Optimization>
235235
<FunctionLevelLinking>true</FunctionLevelLinking>
236236
<IntrinsicFunctions>true</IntrinsicFunctions>

‎vs2013/sandbox_rtti/sandbox_rtti.vcxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@
152152
</PropertyGroup>
153153
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
154154
<ClCompile>
155-
<WarningLevel>Level3</WarningLevel>
155+
<WarningLevel>Level4</WarningLevel>
156156
<Optimization>Disabled</Optimization>
157157
<SDLCheck>true</SDLCheck>
158158
</ClCompile>
@@ -162,7 +162,7 @@
162162
</ItemDefinitionGroup>
163163
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
164164
<ClCompile>
165-
<WarningLevel>Level3</WarningLevel>
165+
<WarningLevel>Level4</WarningLevel>
166166
<Optimization>Disabled</Optimization>
167167
<SDLCheck>true</SDLCheck>
168168
</ClCompile>
@@ -172,7 +172,7 @@
172172
</ItemDefinitionGroup>
173173
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
174174
<ClCompile>
175-
<WarningLevel>Level3</WarningLevel>
175+
<WarningLevel>Level4</WarningLevel>
176176
<Optimization>Disabled</Optimization>
177177
<SDLCheck>true</SDLCheck>
178178
</ClCompile>
@@ -182,7 +182,7 @@
182182
</ItemDefinitionGroup>
183183
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
184184
<ClCompile>
185-
<WarningLevel>Level3</WarningLevel>
185+
<WarningLevel>Level4</WarningLevel>
186186
<Optimization>Disabled</Optimization>
187187
<SDLCheck>true</SDLCheck>
188188
</ClCompile>
@@ -192,7 +192,7 @@
192192
</ItemDefinitionGroup>
193193
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
194194
<ClCompile>
195-
<WarningLevel>Level3</WarningLevel>
195+
<WarningLevel>Level4</WarningLevel>
196196
<Optimization>MaxSpeed</Optimization>
197197
<FunctionLevelLinking>true</FunctionLevelLinking>
198198
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -206,7 +206,7 @@
206206
</ItemDefinitionGroup>
207207
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
208208
<ClCompile>
209-
<WarningLevel>Level3</WarningLevel>
209+
<WarningLevel>Level4</WarningLevel>
210210
<Optimization>MaxSpeed</Optimization>
211211
<FunctionLevelLinking>true</FunctionLevelLinking>
212212
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -220,7 +220,7 @@
220220
</ItemDefinitionGroup>
221221
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
222222
<ClCompile>
223-
<WarningLevel>Level3</WarningLevel>
223+
<WarningLevel>Level4</WarningLevel>
224224
<Optimization>MaxSpeed</Optimization>
225225
<FunctionLevelLinking>true</FunctionLevelLinking>
226226
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -234,7 +234,7 @@
234234
</ItemDefinitionGroup>
235235
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
236236
<ClCompile>
237-
<WarningLevel>Level3</WarningLevel>
237+
<WarningLevel>Level4</WarningLevel>
238238
<Optimization>MaxSpeed</Optimization>
239239
<FunctionLevelLinking>true</FunctionLevelLinking>
240240
<IntrinsicFunctions>true</IntrinsicFunctions>

‎vs2013/sandbox_vs_dll/sandbox_vs_dll.vcxproj

+8-8
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@
161161
</PropertyGroup>
162162
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
163163
<ClCompile>
164-
<WarningLevel>Level3</WarningLevel>
164+
<WarningLevel>Level4</WarningLevel>
165165
<Optimization>Disabled</Optimization>
166166
<SDLCheck>true</SDLCheck>
167167
</ClCompile>
@@ -171,7 +171,7 @@
171171
</ItemDefinitionGroup>
172172
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
173173
<ClCompile>
174-
<WarningLevel>Level3</WarningLevel>
174+
<WarningLevel>Level4</WarningLevel>
175175
<Optimization>Disabled</Optimization>
176176
<SDLCheck>true</SDLCheck>
177177
</ClCompile>
@@ -181,7 +181,7 @@
181181
</ItemDefinitionGroup>
182182
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
183183
<ClCompile>
184-
<WarningLevel>Level3</WarningLevel>
184+
<WarningLevel>Level4</WarningLevel>
185185
<Optimization>Disabled</Optimization>
186186
<SDLCheck>true</SDLCheck>
187187
</ClCompile>
@@ -191,7 +191,7 @@
191191
</ItemDefinitionGroup>
192192
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|x64'">
193193
<ClCompile>
194-
<WarningLevel>Level3</WarningLevel>
194+
<WarningLevel>Level4</WarningLevel>
195195
<Optimization>Disabled</Optimization>
196196
<SDLCheck>true</SDLCheck>
197197
</ClCompile>
@@ -201,7 +201,7 @@
201201
</ItemDefinitionGroup>
202202
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
203203
<ClCompile>
204-
<WarningLevel>Level3</WarningLevel>
204+
<WarningLevel>Level4</WarningLevel>
205205
<Optimization>MaxSpeed</Optimization>
206206
<FunctionLevelLinking>true</FunctionLevelLinking>
207207
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -215,7 +215,7 @@
215215
</ItemDefinitionGroup>
216216
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
217217
<ClCompile>
218-
<WarningLevel>Level3</WarningLevel>
218+
<WarningLevel>Level4</WarningLevel>
219219
<Optimization>MaxSpeed</Optimization>
220220
<FunctionLevelLinking>true</FunctionLevelLinking>
221221
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -229,7 +229,7 @@
229229
</ItemDefinitionGroup>
230230
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
231231
<ClCompile>
232-
<WarningLevel>Level3</WarningLevel>
232+
<WarningLevel>Level4</WarningLevel>
233233
<Optimization>MaxSpeed</Optimization>
234234
<FunctionLevelLinking>true</FunctionLevelLinking>
235235
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -243,7 +243,7 @@
243243
</ItemDefinitionGroup>
244244
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|x64'">
245245
<ClCompile>
246-
<WarningLevel>Level3</WarningLevel>
246+
<WarningLevel>Level4</WarningLevel>
247247
<Optimization>MaxSpeed</Optimization>
248248
<FunctionLevelLinking>true</FunctionLevelLinking>
249249
<IntrinsicFunctions>true</IntrinsicFunctions>

‎vs2013/unittests/unittests.vcxproj

+4-4
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@
193193
</PropertyGroup>
194194
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
195195
<ClCompile>
196-
<WarningLevel>Level3</WarningLevel>
196+
<WarningLevel>Level4</WarningLevel>
197197
<Optimization>Disabled</Optimization>
198198
<SDLCheck>true</SDLCheck>
199199
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -209,7 +209,7 @@
209209
</ItemDefinitionGroup>
210210
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='DEBUG_VS2015|Win32'">
211211
<ClCompile>
212-
<WarningLevel>Level3</WarningLevel>
212+
<WarningLevel>Level4</WarningLevel>
213213
<Optimization>Disabled</Optimization>
214214
<SDLCheck>true</SDLCheck>
215215
<SuppressStartupBanner>true</SuppressStartupBanner>
@@ -251,7 +251,7 @@
251251
</ItemDefinitionGroup>
252252
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
253253
<ClCompile>
254-
<WarningLevel>Level3</WarningLevel>
254+
<WarningLevel>Level4</WarningLevel>
255255
<Optimization>MaxSpeed</Optimization>
256256
<FunctionLevelLinking>true</FunctionLevelLinking>
257257
<IntrinsicFunctions>true</IntrinsicFunctions>
@@ -269,7 +269,7 @@
269269
</ItemDefinitionGroup>
270270
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release_VS2015|Win32'">
271271
<ClCompile>
272-
<WarningLevel>Level3</WarningLevel>
272+
<WarningLevel>Level4</WarningLevel>
273273
<Optimization>MaxSpeed</Optimization>
274274
<FunctionLevelLinking>true</FunctionLevelLinking>
275275
<IntrinsicFunctions>true</IntrinsicFunctions>

0 commit comments

Comments
 (0)