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

From Mike Weiblen: "Fix for VS7.1 warning C4715: not all control paths return a value"

Browse Source
This commit is contained in:
Robert Osfield 2005-03-23 20:34:02 +00:00
parent 58d60476f0
commit fb4157ae75
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
include/osgUtil/Optimizer
View File

@ -132,7 +132,7 @@ class OSGUTIL_EXPORT Optimizer
inline bool isOperationPermissibleForObject(const osg::StateSet* object, unsigned int option) const
{
if (_isOperationPermissibleForObjectCallback.valid())
_isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
else
return isOperationPermissibleForObjectImplementation(object,option);
}
@ -140,7 +140,7 @@ class OSGUTIL_EXPORT Optimizer
inline bool isOperationPermissibleForObject(const osg::StateAttribute* object, unsigned int option) const
{
if (_isOperationPermissibleForObjectCallback.valid())
_isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
else
return isOperationPermissibleForObjectImplementation(object,option);
}
@ -148,7 +148,7 @@ class OSGUTIL_EXPORT Optimizer
inline bool isOperationPermissibleForObject(const osg::Drawable* object, unsigned int option) const
{
if (_isOperationPermissibleForObjectCallback.valid())
_isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
else
return isOperationPermissibleForObjectImplementation(object,option);
}
@ -156,7 +156,7 @@ class OSGUTIL_EXPORT Optimizer
inline bool isOperationPermissibleForObject(const osg::Node* object, unsigned int option) const
{
if (_isOperationPermissibleForObjectCallback.valid())
_isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
return _isOperationPermissibleForObjectCallback->isOperationPermissibleForObjectImplementation(this,object,option);
else
return isOperationPermissibleForObjectImplementation(object,option);
}