Fix linux (fedora) compilation issues

This commit is contained in:
Joseph Mann 2016-06-30 12:05:50 -06:00
parent 646bede3d9
commit 49ccd8fc7a
2 changed files with 3 additions and 1 deletions

View file

@ -26,7 +26,7 @@ std::string strToUpper(const std::string& str)
}
#if _MSC_VER < 1800
#if defined(_WIN32) && _MSC_VER < 1800
float round(float num)
{
return (float)((int)(num + 0.5f));

View file

@ -15,7 +15,9 @@ Eigen::Affine3f roundMatrix(const Eigen::Affine3f& mat);
Eigen::Vector3f roundVector(const Eigen::Vector3f& vec);
Eigen::Vector2f roundVector(const Eigen::Vector2f& vec);
#if defined(_WIN32) && _MSC_VER < 1800
float round(float num);
#endif
std::string getCanonicalPath(const std::string& str);