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

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

View File

@@ -158,7 +158,7 @@ class OSG_EXPORT Program : public osg::StateAttribute
GLenum getFormat() const {return _format;}
/** Get the size of the program binary data.*/
unsigned int getSize() const { return _data.size(); }
unsigned int getSize() const { return static_cast<unsigned int>(_data.size()); }
/** Get a ptr to the program binary data.*/
unsigned char* getData() { return _data.empty() ? 0 : &(_data.front()); }