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/osgDB/Options
View File

@@ -175,7 +175,7 @@ class OSGDB_EXPORT Options : public osg::Object
void removePluginData(const std::string& s) const { _pluginData.erase(s); }
/** Get number of PluginData values */
unsigned int getNumPluginData() const { return _pluginData.size(); }
unsigned int getNumPluginData() const { return static_cast<unsigned int>(_pluginData.size()); }
/** Sets a plugindata value PluginData with a string */
@@ -195,7 +195,7 @@ class OSGDB_EXPORT Options : public osg::Object
void removePluginStringData(const std::string& s) const { _pluginStringData.erase(s); }
/** Get number of PluginStrData values */
unsigned int getNumPluginStringData() const { return _pluginStringData.size(); }
unsigned int getNumPluginStringData() const { return static_cast<unsigned int>(_pluginStringData.size()); }
/** Parse string into plugin string data. This will be automatically done in Options(const std::string&) */
void parsePluginStringData(const std::string& str, char separator1=' ', char separator2='=');