From fb4157ae75cc587344ecab785be57dee203256b6 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 23 Mar 2005 20:34:02 +0000 Subject: [PATCH] From Mike Weiblen: "Fix for VS7.1 warning C4715: not all control paths return a value" --- include/osgUtil/Optimizer | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/osgUtil/Optimizer b/include/osgUtil/Optimizer index 6034713e7..a7bed0271 100644 --- a/include/osgUtil/Optimizer +++ b/include/osgUtil/Optimizer @@ -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); }