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

Fixed clang warnings

Browse Source
This commit is contained in:
Robert Osfield
2016-06-03 09:33:47 +01:00
parent 7d7c0daa5e
commit 41ce857c93
4 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
include/osg/ValueMap
View File

@@ -50,16 +50,18 @@ class OSG_EXPORT ValueMap : public osg::Object
{
typedef TemplateValueObject<T> UserValueObject;
KeyValueMap::iterator itr = _keyValueMap.find(key);
if (itr!=_keyValueMap.end() && typeid(*(itr->second))==typeid(UserValueObject))
if (itr!=_keyValueMap.end())
{
UserValueObject* uvo = static_cast<UserValueObject*>(itr->second.get());
uvo->setValue(value);
return uvo;
}
else
{
return (_keyValueMap[key] = new UserValueObject(value)).get();
osg::Object* obj = itr->second.get();
if (typeid(*(obj))==typeid(UserValueObject))
{
UserValueObject* uvo = static_cast<UserValueObject*>(itr->second.get());
uvo->setValue(value);
return uvo;
}
}
return (_keyValueMap[key] = new UserValueObject(value)).get();
}

2
src/osg/Identifier.cpp
View File

@@ -123,4 +123,4 @@ Identifier* osg::Identifier::get(osg::Referenced* first, osg::Referenced* second
return get("", 0, first, second);
}
}
}

3
src/osgPlugins/ffmpeg/FFmpegClocks.cpp
View File

@@ -15,9 +15,6 @@ namespace osgFFmpeg {
namespace
{
const double AV_SYNC_THRESHOLD = 0.01;
const double AV_NOSYNC_THRESHOLD = 10.0;
inline double clamp(const double value, const double min, const double max)
{
return (std::min)((std::max)(value, min), max);

2
src/osgWrappers/serializers/osg/PrimitiveSet.cpp
View File

@@ -163,4 +163,4 @@ REGISTER_OBJECT_WRAPPER( MultiDrawArrays,
}
}
#endif
#endif