Skip to content
Permalink
Browse files

refs #7351 Fixed ParameterMap failing in debug mode

after replacing double if statement
It does not look like anything to do with SofQ but prevents me from running unit tests for algorithms.
  • Loading branch information
abuts committed Jul 15, 2013
1 parent 8e1094c commit b3c51923444cab1ef5eae67ee196c2c144ba21c5
Showing with 15 additions and 14 deletions.
  1. +15 −14 Code/Mantid/Framework/Geometry/src/Instrument/ParameterMap.cpp
@@ -540,20 +540,21 @@ namespace Mantid
{
const ComponentID id = comp->getComponentID();
pmap_cit it_found = m_map.find(id);
if( it_found->first && it_found != m_map.end() )
{
pmap_cit itr = m_map.lower_bound(id);
pmap_cit itr_end = m_map.upper_bound(id);
for( ; itr != itr_end; ++itr )
{
Parameter_sptr param = itr->second;
if( boost::iequals(param->type(), type) )
{
result = param;
break;
}
}
}
if(it_found != m_map.end() )
if (it_found->first)
{
pmap_cit itr = m_map.lower_bound(id);
pmap_cit itr_end = m_map.upper_bound(id);
for( ; itr != itr_end; ++itr )
{
Parameter_sptr param = itr->second;
if( boost::iequals(param->type(), type) )
{
result = param;
break;
}
}
}
}
}
return result;

0 comments on commit b3c5192

Please sign in to comment.
You can’t perform that action at this time.