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/Shader
View File

@@ -53,7 +53,7 @@ class OSG_EXPORT ShaderBinary : public osg::Object
void assign(unsigned int size, const unsigned char* data);
/** Get the size of the shader 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 shader binary data.*/
unsigned char* getData() { return _data.empty() ? 0 : &(_data.front()); }
@@ -294,7 +294,7 @@ class OSG_EXPORT ShaderComponent : public osg::Object
osg::Shader* getShader(unsigned int i) { return _shaders[i].get(); }
const osg::Shader* getShader(unsigned int i) const { return _shaders[i].get(); }
unsigned int getNumShaders() const { return _shaders.size(); }
unsigned int getNumShaders() const { return static_cast<unsigned int>(_shaders.size()); }
virtual void compileGLObjects(State& state) const;
virtual void resizeGLObjectBuffers(unsigned int maxSize);