Peerplays_Blockchain/peerplays-fc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #105 from bitshares/jmj_1560

Browse source 
fix std::min parameter conversion
This commit is contained in:
John M. Jones 2019-02-05 16:53:04 -05:00 committed by GitHub
commit 8ebd99b786
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
include/fc/container/flat.hpp
View file

@ -25,7 +25,7 @@ namespace fc {
--_max_depth; --_max_depth;
unsigned_int size; unpack( s, size, _max_depth ); unsigned_int size; unpack( s, size, _max_depth );
value.clear(); value.clear();
value.reserve( std::min( size.value, FC_MAX_PREALLOC_SIZE ) ); value.reserve( std::min( size.value, static_cast<uint64_t>(FC_MAX_PREALLOC_SIZE) ) );
for( uint32_t i = 0; i < size.value; ++i ) for( uint32_t i = 0; i < size.value; ++i )
{ {
T tmp; T tmp;
@ -52,7 +52,7 @@ namespace fc {
--_max_depth; --_max_depth;
unsigned_int size; unpack( s, size, _max_depth ); unsigned_int size; unpack( s, size, _max_depth );
value.clear(); value.clear();
value.reserve( std::min( size.value, FC_MAX_PREALLOC_SIZE ) ); value.reserve( std::min( size.value, static_cast<uint64_t>(FC_MAX_PREALLOC_SIZE) ) );
for( uint32_t i = 0; i < size.value; ++i ) for( uint32_t i = 0; i < size.value; ++i )
{ {
std::pair<K,V> tmp; std::pair<K,V> tmp;
@ -85,11 +85,11 @@ namespace fc {
unsigned_int size; unsigned_int size;
unpack( s, size, _max_depth ); unpack( s, size, _max_depth );
if( !std::is_fundamental<T>::value ) { if( !std::is_fundamental<T>::value ) {
value.resize( std::min( size.value, FC_MAX_PREALLOC_SIZE ) ); value.resize( std::min( size.value, static_cast<uint64_t>(FC_MAX_PREALLOC_SIZE) ) );
for( uint64_t i = 0; i < size; i++ ) for( uint64_t i = 0; i < size; i++ )
{ {
if( i >= value.size() ) if( i >= value.size() )
value.resize( std::min( 2*value.size(), size.value ) ); value.resize( std::min( static_cast<uint64_t>(2*value.size()), size.value ) );
unpack( s, value[i], _max_depth ); unpack( s, value[i], _max_depth );
} }
} else { } else {

12
include/fc/io/raw.hpp
View file

@ -428,7 +428,7 @@ namespace fc {
--_max_depth; --_max_depth;
unsigned_int size; fc::raw::unpack( s, size, _max_depth ); unsigned_int size; fc::raw::unpack( s, size, _max_depth );
value.clear(); value.clear();
value.reserve( std::min( size.value, FC_MAX_PREALLOC_SIZE ) ); value.reserve( std::min( size.value, static_cast<uint64_t>(FC_MAX_PREALLOC_SIZE) ) );
for( uint32_t i = 0; i < size.value; ++i ) for( uint32_t i = 0; i < size.value; ++i )
{ {
T tmp; T tmp;
@ -473,7 +473,7 @@ namespace fc {
--_max_depth; --_max_depth;
unsigned_int size; fc::raw::unpack( s, size, _max_depth ); unsigned_int size; fc::raw::unpack( s, size, _max_depth );
value.clear(); value.clear();
value.reserve( std::min( size.value, FC_MAX_PREALLOC_SIZE ) ); value.reserve( std::min( size.value, static_cast<uint64_t>(FC_MAX_PREALLOC_SIZE) ) );
for( uint32_t i = 0; i < size.value; ++i ) for( uint32_t i = 0; i < size.value; ++i )
{ {
std::pair<K,V> tmp; std::pair<K,V> tmp;
@ -526,11 +526,11 @@ namespace fc {
FC_ASSERT( _max_depth > 0 ); FC_ASSERT( _max_depth > 0 );
--_max_depth; --_max_depth;
unsigned_int size; fc::raw::unpack( s, size, _max_depth ); unsigned_int size; fc::raw::unpack( s, size, _max_depth );
value.resize( std::min( size.value, FC_MAX_PREALLOC_SIZE ) ); value.resize( std::min( size.value, static_cast<uint64_t>(FC_MAX_PREALLOC_SIZE) ) );
for( uint64_t i = 0; i < size; i++ ) for( uint64_t i = 0; i < size; i++ )
{ {
if( i >= value.size() ) if( i >= value.size() )
value.resize( std::min( 2*value.size(), size.value ) ); value.resize( std::min( static_cast<uint64_t>(2*value.size()), size.value ) );
unpack( s, value[i], _max_depth ); unpack( s, value[i], _max_depth );
} }
} }
@ -553,11 +553,11 @@ namespace fc {
FC_ASSERT( _max_depth > 0 ); FC_ASSERT( _max_depth > 0 );
--_max_depth; --_max_depth;
unsigned_int size; fc::raw::unpack( s, size, _max_depth ); unsigned_int size; fc::raw::unpack( s, size, _max_depth );
value.resize( std::min( size.value, FC_MAX_PREALLOC_SIZE ) ); value.resize( std::min( size.value, static_cast<uint64_t>(FC_MAX_PREALLOC_SIZE) ) );
for( uint64_t i = 0; i < size; i++ ) for( uint64_t i = 0; i < size; i++ )
{ {
if( i >= value.size() ) if( i >= value.size() )
value.resize( std::min( 2*value.size(), size.value ) ); value.resize( std::min( static_cast<uint64_t>(2*value.size()), size.value ) );
unpack( s, value[i], _max_depth ); unpack( s, value[i], _max_depth );
} }
} }

3
include/fc/io/raw_variant.hpp
View file

@ -1,4 +1,5 @@
#pragma once #pragma once
#include <algorithm>
#include <fc/exception/exception.hpp> #include <fc/exception/exception.hpp>
#include <fc/io/raw_fwd.hpp> #include <fc/io/raw_fwd.hpp>
#include <fc/variant_object.hpp> #include <fc/variant_object.hpp>
@ -144,7 +145,7 @@ namespace fc { namespace raw {
unsigned_int vs; unsigned_int vs;
unpack( s, vs, _max_depth ); unpack( s, vs, _max_depth );
mutable_variant_object mvo; mutable_variant_object mvo;
mvo.reserve( std::min( vs.value, FC_MAX_PREALLOC_SIZE ) ); mvo.reserve( std::min( vs.value, static_cast<uint64_t>(FC_MAX_PREALLOC_SIZE) ) );
for( uint32_t i = 0; i < vs.value; ++i ) for( uint32_t i = 0; i < vs.value; ++i )
{ {
fc::string key; fc::string key;