Merge branch 'develop'

This commit is contained in:
Frank Mori Hess 2014-03-02 12:42:18 -05:00
commit 7085769baf
3 changed files with 3 additions and 3 deletions

View File

@ -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 &)

View File

@ -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 &)

View File

@ -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)