VS2013 compile fixes.

- mostly about return type conversions.
This commit is contained in:
James Turner 2016-01-27 14:02:27 +00:00
parent 576ff21488
commit 819833a560
4 changed files with 5 additions and 5 deletions

View File

@ -43,7 +43,7 @@ public:
void removeChild(BVHNode* child); void removeChild(BVHNode* child);
unsigned getNumChildren() const unsigned getNumChildren() const
{ return _children.size(); } { return static_cast<unsigned>(_children.size()); }
const BVHNode* getChild(unsigned i) const const BVHNode* getChild(unsigned i) const
{ if (_children.size() <= i) return 0; return _children[i]; } { if (_children.size() <= i) return 0; return _children[i]; }
BVHNode* getChild(unsigned i) BVHNode* getChild(unsigned i)

View File

@ -31,13 +31,13 @@ public:
virtual ~BVHStaticData() {} virtual ~BVHStaticData() {}
unsigned addVertex(const SGVec3f& vertex) unsigned addVertex(const SGVec3f& vertex)
{ _vertices.push_back(vertex); return _vertices.size() - 1; } { _vertices.push_back(vertex); return static_cast<unsigned>(_vertices.size() - 1); }
const SGVec3f& getVertex(unsigned i) const const SGVec3f& getVertex(unsigned i) const
{ return _vertices[i]; } { return _vertices[i]; }
unsigned addMaterial(const BVHMaterial* material) unsigned addMaterial(const BVHMaterial* material)
{ _materials.push_back(material); return _materials.size() - 1; } { _materials.push_back(material); return static_cast<unsigned>(_materials.size() - 1); }
const BVHMaterial* getMaterial(unsigned i) const const BVHMaterial* getMaterial(unsigned i) const
{ if (_materials.size() <= i) return 0; return _materials[i]; } { if (_materials.size() <= i) return 0; return _materials[i]; }

View File

@ -41,7 +41,7 @@ public:
bool load( const SGPath& path ); bool load( const SGPath& path );
// stars // stars
inline int getNumStars() const { return _stars.size(); } inline int getNumStars() const { return static_cast<int>(_stars.size()); }
inline SGVec3d *getStars() { return &(_stars[0]); } inline SGVec3d *getStars() { return &(_stars[0]); }
private: private:

View File

@ -154,7 +154,7 @@ public:
static bool isNaN(const T& v) static bool isNaN(const T& v)
{ {
#ifdef HAVE_ISNAN #ifdef HAVE_ISNAN
return isnan(v); return (isnan(v) != 0);
#elif defined HAVE_STD_ISNAN #elif defined HAVE_STD_ISNAN
return std::isnan(v); return std::isnan(v);
#else #else