Fixed clang warnings

remotes/origin/Deprecated_master_20th_November_2022
Robert Osfield 8 years ago
parent 7d7c0daa5e
commit 41ce857c93

@ -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();
}

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

@ -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);

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

Loading…
Cancel
Save