Fixed merge

This commit is contained in:
Christophe Riccio 2011-09-16 09:46:37 +01:00
commit 472174a206

View File

@ -239,7 +239,7 @@ namespace detail
if(x < 0)
return genType(int(x - genType(0.5)));
return genType(int(x + genType(0.5)));
return genType(int(x + genType(0.5)));
}
template <typename valType>