File tree 5 files changed +10
-9
lines changed
5 files changed +10
-9
lines changed Original file line number Diff line number Diff line change @@ -6022,6 +6022,8 @@ class SafeInt
6022
6022
m_int = (T)(b ? 1 : 0 );
6023
6023
}
6024
6024
6025
+ constexpr SafeInt (const SafeInt<T, E>& u) SAFEINT_CPP_THROW = default;
6026
+
6025
6027
template <typename U>
6026
6028
SafeInt (const SafeInt<U, E>& u) SAFEINT_CPP_THROW
6027
6029
{
Original file line number Diff line number Diff line change @@ -918,7 +918,7 @@ class array
918
918
msl::safeint3::SafeInt<size_type> nMinSize (index );
919
919
nMinSize += 1 ;
920
920
msl::safeint3::SafeInt<size_type> nlastSize (m_elements.size ());
921
- if (nlastSize < nMinSize) m_elements.resize (nMinSize);
921
+ if (nlastSize < nMinSize) m_elements.resize ((size_type) nMinSize);
922
922
923
923
return m_elements[index ];
924
924
}
Original file line number Diff line number Diff line change @@ -288,7 +288,7 @@ bool web::json::number::is_int32() const
288
288
case signed_type:
289
289
return m_intval >= (std::numeric_limits<int32_t >::min)() &&
290
290
m_intval <= (std::numeric_limits<int32_t >::max)();
291
- case unsigned_type: return m_uintval <= (std::numeric_limits<int32_t >::max)();
291
+ case unsigned_type: return m_uintval <= (uint32_t )( std::numeric_limits<int32_t >::max)();
292
292
case double_type:
293
293
default : return false ;
294
294
}
Original file line number Diff line number Diff line change @@ -557,16 +557,15 @@ int main(int argc, char* argv[])
557
557
breakOnError = true ;
558
558
}
559
559
560
- // Determine if list or listProperties.
561
- bool listOption = false , listPropertiesOption = false ;
560
+ // The list_test_options() function determines if list or listProperties.
561
+ bool listOption = false ;
562
562
if (UnitTest::GlobalSettings::Has (" list" ))
563
563
{
564
564
listOption = true ;
565
565
}
566
566
if (UnitTest::GlobalSettings::Has (" listproperties" ))
567
567
{
568
568
listOption = true ;
569
- listPropertiesOption = true ;
570
569
}
571
570
#ifdef _WIN32
572
571
if (UnitTest::GlobalSettings::Has (" detectleaks" ))
Original file line number Diff line number Diff line change @@ -206,7 +206,7 @@ SUITE(compression_tests)
206
206
std::vector<uint8_t > cmp_buffer (buffer_size);
207
207
size_t cmpsize = buffer_size;
208
208
size_t csize = 0 ;
209
- operation_result r = {0 };
209
+ operation_result r = {};
210
210
operation_hint hint = operation_hint::has_more;
211
211
for (i = 0 ; i < buffer_size || csize == cmpsize || !r.done ; i += r.input_bytes_processed )
212
212
{
@@ -361,9 +361,9 @@ SUITE(compression_tests)
361
361
if (!cfactory)
362
362
{
363
363
auto size = tuples[i][0 ];
364
- compress_and_decompress (utility::details::make_unique<fake_provider>(tuples[i][ 0 ] ),
365
- utility::details::make_unique<fake_provider>(tuples[i][ 0 ] ),
366
- tuples[i][ 0 ] ,
364
+ compress_and_decompress (utility::details::make_unique<fake_provider>(size ),
365
+ utility::details::make_unique<fake_provider>(size ),
366
+ size ,
367
367
tuples[i][1 ],
368
368
!!j);
369
369
}
You can’t perform that action at this time.
0 commit comments