FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

From Ulrich Hertlein, "Attached is a patch that introduces 'static_cast<unsigned int>' on some instances where

Browse Source 
the code returns '.size()' of a std::vector.  This caused some warnings when using clang++
on OS X."
This commit is contained in:
Robert Osfield
2013-05-14 16:12:21 +00:00
parent 93eb471d99
commit 1a683e2f83
16 changed files with 32 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
include/osg/Geode
View File

@@ -90,7 +90,7 @@ class OSG_EXPORT Geode : public Node
/** Return the number of <tt>Drawable</tt>s currently attached to the
* \c Geode.
*/
inline unsigned int getNumDrawables() const { return _drawables.size(); }
inline unsigned int getNumDrawables() const { return static_cast<unsigned int>(_drawables.size()); }
/** Return the \c Drawable at position \c i.*/
inline Drawable* getDrawable( unsigned int i ) { return _drawables[i].get(); }
@@ -121,7 +121,7 @@ class OSG_EXPORT Geode : public Node
{
if (_drawables[drawableNum]==drawable) return drawableNum;
}
return _drawables.size(); // drawable not found.
return static_cast<unsigned int>(_drawables.size()); // drawable not found.
}
/** Get the list of drawables.*/