Merge branch 'develop'
This commit is contained in:
commit
7085769baf
@ -34,7 +34,7 @@ struct max_or_default {
|
||||
{
|
||||
try
|
||||
{
|
||||
if(max == false) max = *first;
|
||||
if(!max) max = *first;
|
||||
else max = (*first > max.get())? *first : max;
|
||||
}
|
||||
catch(const boost::bad_weak_ptr &)
|
||||
|
@ -29,7 +29,7 @@ struct max_or_default {
|
||||
{
|
||||
try
|
||||
{
|
||||
if(max == false) max = *first;
|
||||
if(!max) max = *first;
|
||||
else max = (*first > max.get())? *first : max;
|
||||
}
|
||||
catch(const boost::bad_weak_ptr &)
|
||||
|
@ -33,7 +33,7 @@ struct max_or_default {
|
||||
for(; first != last; ++first)
|
||||
{
|
||||
T value = *first;
|
||||
if(max == false)
|
||||
if(!max)
|
||||
{
|
||||
max = value;
|
||||
}else if(value > *max)
|
||||
|
Loading…
Reference in New Issue
Block a user